r1952: *** empty log message ***

diff --git a/make-dist.sh b/make-dist.sh
index ee423ac3c0c18bd9a9f343713f79a105cc36ede5..0b28e92b7aae6770e1f21a35cc606e3a532fe912 100755 (executable)
--- a/make-dist.sh
+++ b/make-dist.sh
@@ -76,7 +76,7 @@ cp -a ${TOPDIR} ${DISTDIR}
 echo "Cleaning distribution directory ${DISTDIR}"
 cd ${DISTDIR}
 make distclean
-rm -f upload.sh make-dist.sh cvsbp-prepare 
+rm -f upload.sh make-dist.sh make-doc.sh cvsbp-prepare 
 rm -f `find . -type f -name .cvsignore`
 rm -rf `find . -type d -name CVS`
 rm -f `find . -type f -name '*~' -or -name '#*'  -or -name '#*#' -or -name '.#*'`
@@ -94,7 +94,6 @@ if [ "${DISTDIR}" != "${DEBDIR}" ]; then
 else
   cp -a ${DISTDIR} ${DEBDIR}-copy
 fi
-GZIP=-9 tar czf ${DEBPKG}_${VERSION}.orig.tar.gz ${DEBDIR}
 
 unix2dos `find ${DISTDIR} -type f -and -name '*.c' -or -name '*.h' -or \
   -name '*.cpp' -or -name '*.sh' -or -name '*.in' -or \
@@ -108,12 +107,12 @@ rm -rf ${DISTDIR}
 if [ "${DISTDIR}" == "${DEBDIR}" ]; then 
   mv ${DEBDIR}-copy ${DEBDIR}
 fi
+GZIP=-9 tar czf ${DEBPKG}_${VERSION}.orig.tar.gz ${DEBDIR}
 
 cp -a ${TOPDIR}/debian ${DEBDIR}
 rm -f ${DEBDIR}/debian/.cvsignore 
 rm -rf ${DEBDIR}/debian/CVS
 
-
 echo "Building Debian files"
 if [ -z ${opt_dpkg_buildpackage} ]; then
   cd ${TOPDIR}
@@ -123,14 +122,13 @@ else
   cd ${DEBDIR}
   dpkg-buildpackage -rfakeroot -kkevin@rosenberg.net 
   cd ..
-  mv ${DEBPKG}_${VERSION}* ${PACKAGE_DIR}
+  mv -f ${DEBPKG}_${VERSION}* ${PACKAGE_DIR}
 fi
 rm -rf ${DEBDIR}
 
 echo "Moving upstream archives to ${PACKAGE_DIR}"
 mkdir -p /usr/local/src/Packages/${DEBPKG}
-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}
+mv -f ${DISTDIR}.zip ${DISTDIR}.tar.gz ${PACKAGE_DIR}
 
 if [ ! -z ${opt_lintian} ]; then
   pushd ${PACKAGE_DIR} > /dev/null