r1934: *** empty log message ***

diff --git a/make-dist.sh b/make-dist.sh
index 3bbd21325d26a39c895c6dc06a8336fc80d33470..4982407f5e568136609734e015b45b6acfa0400b 100755 (executable)
--- a/make-dist.sh
+++ b/make-dist.sh
@@ -92,24 +92,25 @@ rm -rf ${DEBDIR}/debian/CVS
 
 rm -rf ${DISTDIR}
 
+echo "Moving upstream archives to ${PACKAGE_DIR}"
+rm -f ${PACKAGE_DIR}/${DISTDIR}.zip ${PACKAGE_DIR}/${DEBPKG}_${VERSION}.orig.tar.gz
+mv ${DISTDIR}.zip ${DEBPKG}_${VERSION}.orig.tar.gz ${DISTDIR}.tar.gz ${PACKAGE_DIR}
+
+echo "Building Debian files"
 if [ -z ${opt_dpkg_buildpackage} ]; then
   cd ${TOPDIR}
   cvs-buildpackage -rfakeroot -kkevin@rosenberg.net -H${TOPDIR}/cvsbp-prepare -tC -i.pdf ${DEBPKG}
   cd ..
 else
   cd ${DEBDIR}
-  echo "Building Debian files"
   dpkg-buildpackage -rfakeroot -kkevin@rosenberg.net -a
   cd ..
 fi
-
 rm -rf ${DEBDIR}
 
-echo "Moving Upstream and Debian Files to ${PACKAGE_DIR}"
+echo "Moving Debian files to ${PACKAGE_DIR}"
 mkdir -p /usr/local/src/Packages/${DEBPKG}
 mv ${DEBPKG}_${VERSION}* ${PACKAGE_DIR}
-mv ${DISTDIR}.zip ${PACKAGE_DIR}
-mv ${DISTDIR}.tar.gz ${PACKAGE_DIR}
 
 if [ ! -z ${opt_lintian} ]; then
   pushd ${PACKAGE_DIR} > /dev/null