r2099: Committing for 3.5.4

diff --git a/configure b/configure
index 5cb7733e8be1f0ff8f1198ff876e388e628cb6f8..658cd915546d37ed9b5217b8792da4d008bd65cb 100755 (executable)
--- a/configure
+++ b/configure
@@ -1415,7 +1415,7 @@ fi
 
 PACKAGE=ctsim
 
-VERSION=3.5.3
+VERSION=3.5.4
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5

diff --git a/configure.ac b/configure.ac
index 93ea168705039f4c323d6a19fe10dd5defd9930f..6632e39bd281d984c42cbae747ec4a54dc474288 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -5,7 +5,7 @@ dnl CDPATH=
 
 AC_INIT
 AC_CONFIG_SRCDIR([src/ctsim.cpp])
-AM_INIT_AUTOMAKE(ctsim,3.5.3)
+AM_INIT_AUTOMAKE(ctsim,3.5.4)
 AM_CONFIG_HEADER(config.h)
 
 dnl Checks for programs.

diff --git a/debian/changelog b/debian/changelog
index a8bdd18ecc37448581b0a1188e1967de0eba8945..6968bbd9d0c9a9bcb8d575054022279e8266cc55 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-ctsim (3.5.3-2) unstable; urgency=low
+ctsim (3.5.4-1) unstable; urgency=low
 
   * New upstream version
 

diff --git a/make-upstream.sh b/make-upstream.sh
index aa72dacd3d6e73c916286b5d57a97adccd2bde85..edf3051474ce27c28c42dc0cdda7ba4515955475 100755 (executable)
--- a/make-upstream.sh
+++ b/make-upstream.sh
@@ -13,6 +13,7 @@ Usage: $progname [options]
 Creates upstream archives
 Options:
   -t   Tag CVS tree with current version numbers
+  -c   Commit all files to CVS server
   -h   Print this brief help
 EOF
 }
@@ -23,6 +24,7 @@ while [ $# != 0 ]; do
     case "$1" in
         -h)  usage; exit 0           ;;
         -t)  opt_tag=1               ;;
+        -c)  opt_commit=1            ;;
          *)  usage; exit 0           ;;
     esac
     shift
@@ -50,6 +52,11 @@ if [ -f ${PACKAGE_DIR}/${DEBPKG}_${VERSION}.orig.tar.gz ]; then
   esac
 fi
 
+if [ ! -z ${opt_commit} ]; then
+    echo "Committing to CVS server"
+    cvs commit -m "Committing for ${VERSION}"
+fi
+
 if [ ! -z ${opt_tag} ]; then
     UPSTREAM_TAG=upstream_version_`echo ${VERSION} | tr . _`
     echo "(Re-)tagging with Upstream tag '${UPSTREAM_TAG}'"
@@ -57,6 +64,7 @@ if [ ! -z ${opt_tag} ]; then
     cvs -q tag -F $UPSTREAM_TAG > /dev/null
 fi
 
+
 if [ ! -f docs/${PKG}.htb -o ! -f docs/html/${PKG}_contents.html -o ! -f docs/${PKG}.pdf ]; then
   echo "Making documentation"
   ../make-doc.sh