r2028: added reader features for non-allegro systems

[clsql.git] / make-upstream.sh

diff --git a/make-upstream.sh b/make-upstream.sh
index 0f022bab5b73352c00e3e54f1a4b538816ce18d9..c02895c5a69178c12588987ebea87769f748479a 100755 (executable)
--- a/make-upstream.sh
+++ b/make-upstream.sh
@@ -38,6 +38,14 @@ PACKAGE_DIR=/usr/local/src/Packages/${DEBPKG}
 DISTDIR=${PKG}-${VERSION}
 DEBDIR=${DEBPKG}-${VERSION}
 
+if [ ! -z ${opt_tag} ]; then
+    UPSTREAM_TAG=upstream_version_`echo ${VERSION} | tr . _`
+    echo "(Re-)tagging with Upstream tag '${UPSTREAM_TAG}'"
+    cvs -q rtag -d $UPSTREAM_TAG $PKG > /dev/null
+    cvs -q tag -F $UPSTREAM_TAG > /dev/null
+
+fi
+
 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): "
@@ -50,13 +58,6 @@ if [ -f ${PACKAGE_DIR}/${DEBPKG}_${VERSION}.orig.tar.gz ]; then
   esac
 fi
 
-if [ ! -z ${opt_tag} ]; then
-    UPSTREAM_TAG=upstream_version_`echo ${VERSION} | tr . _`
-    echo "(Re-)tagging with Upstream tag '${UPSTREAM_TAG}'"
-    cvs -q rtag -d $UPSTREAM_TAG $PKG > /dev/null
-    cvs -q tag -F $UPSTREAM_TAG > /dev/null
-
-fi
 # Prepare for archive
 cd ..
 rm -f ${PKG}_${VERSION}.tar.gz ${DEBPKG}_${VERSION}.orig.tar.gz
@@ -66,6 +67,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 `find . -type f -name .cvsignore`
 rm -rf `find . -type d -name CVS`
 rm -f `find . -type f -name '*~' -or -name '.#*'  -or -name '#*#' -or -name ".*~"`