X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=make-upstream.sh;h=568fe2aa619a706327310ab5579a753fe0e9c5c1;hb=4f48d771ad17d7e753382fe8f551e7a9ca9e7b53;hp=2b910d2adb931e2f52452de18833060a7d2eda52;hpb=448a10bde3b7e25abfab28a4c057b523fdfb47f4;p=clsql.git

diff --git a/make-upstream.sh b/make-upstream.sh
index 2b910d2..568fe2a 100755
--- a/make-upstream.sh
+++ b/make-upstream.sh
@@ -12,6 +12,7 @@ usage () {
 Usage: $progname [options]
 Creates upstream archives
 Options:
+  -c   Commit and tag CVS tree with current version numbers
   -t   Tag CVS tree with current version numbers
   -h   Print this brief help
 EOF
@@ -22,6 +23,7 @@ while [ $# != 0 ]; do
     value="`echo x\"$1\" | sed -e 's/^x-.//'`"
     case "$1" in
         -h)  usage; exit 0           ;;
+        -c)  opt_commit=1; opt_tag=1 ;;
         -t)  opt_tag=1               ;;
          *)  usage; exit 0           ;;
     esac
@@ -38,6 +40,10 @@ PACKAGE_DIR=/usr/local/src/Packages/${DEBPKG}
 DISTDIR=${PKG}-${VERSION}
 DEBDIR=${DEBPKG}-${VERSION}
 
+if [ ! -z ${opt_commit} ]; then
+    cvs commit -m 'Debian build'
+fi
+
 if [ ! -z ${opt_tag} ]; then
     UPSTREAM_TAG=upstream_version_`echo ${VERSION} | tr . _`
     echo "(Re-)tagging with Upstream tag '${UPSTREAM_TAG}'"
@@ -67,6 +73,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 ".*~"`