From: Kevin M. Rosenberg <kevin@rosenberg.net>
Date: Thu, 20 Jun 2002 14:31:09 +0000 (+0000)
Subject: r2142: *** empty log message ***
X-Git-Tag: v3.8.6~1043
X-Git-Url: http://git.kpe.io/?p=clsql.git;a=commitdiff_plain;h=3849e5bef023b49847ea4d950f968ccfc21db655

r2142: *** empty log message ***
---

diff --git a/make-upstream.sh b/make-upstream.sh
index a42794e..3518c44 100755
--- a/make-upstream.sh
+++ b/make-upstream.sh
@@ -56,7 +56,7 @@ if [ ! -z ${opt_tag} ]; then
 
 fi
 
-if [ -z ${opt_force} -a -f ${PACKAGE_DIR}/${DEBPKG}_${VERSION}.orig.tar.gz ]; then
+if [ -f ${PACKAGE_DIR}/${DEBPKG}_${VERSION}.orig.tar.gz ]; then
   echo "File ${PACKAGE_DIR}/${DEBPKG}_${VERSION}.orig.tar.gz already exists."
   echo -n "Are you sure that you want to create a new upstream archive? (y/N): "
   read answer
@@ -76,8 +76,7 @@ cp -a ${TOPDIR} ${DISTDIR}
 
 echo "Cleaning distribution directory ${DISTDIR}"
 cd ${DISTDIR}
-rm -f upload.sh make-debian.sh make-upstream.sh cvsbp-prepare.sh 
-rm -f test-suite/test.config
+rm -f upload.sh make-debian.sh make-upstream.sh cvsbp-prepare.sh test-suite/test.config
 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 ".*~"`
diff --git a/upload.sh b/upload.sh
index 9f0fdce..f3096e7 100755
--- a/upload.sh
+++ b/upload.sh
@@ -56,6 +56,7 @@ fi
 scp ${DEBPKG}_${DEBVERSION}.diff.gz ${DEBIAN_DIR}
 scp ${DEBPKG}_${DEBVERSION}.dsc ${DEBIAN_DIR}
 scp ${DEBPKG}_${DEBVERSION}_*.deb ${DEBIAN_DIR}
+scp ${DEBPKG}-*_${DEBVERSION}_*.deb ${DEBIAN_DIR}
 scp ${DEBPKG}_${DEBVERSION}_*.changes ${DEBIAN_DIR} # upload last
 
 popd > /dev/null