releaseversion.sh simplified to handle integer version numbers

diff --git a/citadel/citadel.h b/citadel/citadel.h
index b15e015270ad0e29d0ada937cbc0120d5073481a..6e9e09ff3480167caeaf2f543e65548bc929b105 100644 (file)
--- a/citadel/citadel.h
+++ b/citadel/citadel.h
@@ -45,10 +45,10 @@ extern "C" {
  * usually more strict because you're not really supposed to dump/load and
  * upgrade at the same time.
  */
-#define REV_LEVEL      916             // This version
+#define REV_LEVEL      917             // This version
 #define REV_MIN                591             // Oldest compatible database
 #define EXPORT_REV_MIN 760             // Oldest compatible export files
-#define LIBCITADEL_MIN 916             // Minimum required version of libcitadel
+#define LIBCITADEL_MIN 917             // Minimum required version of libcitadel
 
 #define SERVER_TYPE 0                  // zero for stock Citadel; other developers please
                                        // obtain SERVER_TYPE codes for your implementations

diff --git a/citadel/debian/changelog b/citadel/debian/changelog
index 9509169f0c027177ea8929ae19e2bfdfeadad2b4..a192d46f953b8085d225b218092813b7ba60bdea 100644 (file)
--- a/citadel/debian/changelog
+++ b/citadel/debian/changelog
@@ -1,3 +1,9 @@
+citadel (917-1) stable; urgency=low
+
+  * new release
+
+ -- Wilfried Goesgens <w.goesgens@outgesourced.org>  Wed, 03 Jan 2018 16:57:49 -0500
+
 citadel (9.16-1) stable; urgency=low
 
   * new release

diff --git a/libcitadel/configure.in b/libcitadel/configure.in
index 14db2bc74ea468d6d6da3c04039ac2faba2141b0..a39b6d468720fb55ece1ab0d64ad8b068adc16c9 100755 (executable)
--- a/libcitadel/configure.in
+++ b/libcitadel/configure.in
@@ -5,7 +5,7 @@ dnl
 dnl Ensure that libcitadel is configured with autoconf 2.52 or newer
 AC_PREREQ(2.52)
 
-AC_INIT(libcitadel, 916, http://uncensored.citadel.org)
+AC_INIT(libcitadel,917, http://uncensored.citadel.org)
 
 AC_CONFIG_SRCDIR(Makefile.in)
 AC_CONFIG_AUX_DIR(conftools)
@@ -20,7 +20,7 @@ dnl Set LIBAGE to 0.
 dnl
 
 LIBCURRENT=4
-LIBREVISION=916
+LIBREVISION=917
 LIBAGE=0
 
 sinclude(conftools/libtool.m4)

diff --git a/libcitadel/debian/changelog b/libcitadel/debian/changelog
index 61c8344b2e231e4bb7a2714d7c488992e828fc0f..34abd45d04adc9fcfbb0039a674f4cda5c171dbf 100644 (file)
--- a/libcitadel/debian/changelog
+++ b/libcitadel/debian/changelog
@@ -1,3 +1,9 @@
+libcitadel (917-1) stable; urgency=low
+
+  * new release
+
+ -- Wilfried Goesgens <w.goesgens@outgesourced.org>  Wed, 03 Jan 2018 16:57:49 -0500
+
 libcitadel (9.16-1) stable; urgency=low
 
   * new release

diff --git a/libcitadel/lib/libcitadel.h b/libcitadel/lib/libcitadel.h
index 70e9857c53291b9de6f7e525351e5eeb9da06ce4..a6d66c5ecc0812505a4a5e1086a5e99d478edee5 100644 (file)
--- a/libcitadel/lib/libcitadel.h
+++ b/libcitadel/lib/libcitadel.h
@@ -28,7 +28,7 @@
 #include <sys/types.h>
 #include <netinet/in.h>
 
-#define LIBCITADEL_VERSION_NUMBER      916
+#define LIBCITADEL_VERSION_NUMBER      917
 
 /*
  * Here's a bunch of stupid magic to make the MIME parser portable.

diff --git a/releaseversion.sh b/releaseversion.sh
index 74008fca6002b7b93f097f491149de7c421a2039..b0311c23c7f531f82415bf7bacfa458dc6c18f57 100755 (executable)
--- a/releaseversion.sh
+++ b/releaseversion.sh
@@ -116,7 +116,7 @@ sed  -i -e "s;^#define REV_LEVEL.*[0-9][0-9][0-9]\(.*\)$;#define REV_LEVEL\t${NE
 ################################################################################
 # textclient
 DebChangeLog textclient/debian/changelog textclient
-sed -i "s;${OLD_PRINTVERSION};${PRINT_VERSION};" textclient/configure.ac
+sed -i "s;${OLD_VERSION};${NEW_VERSION};" textclient/configure.ac
 
 
 

diff --git a/textclient/debian/changelog b/textclient/debian/changelog
index 7c148d67d608a32da9a77a29558b0077661d4c26..38b455c160409977d76de896c7f8f82d108d3855 100644 (file)
--- a/textclient/debian/changelog
+++ b/textclient/debian/changelog
@@ -1,3 +1,9 @@
+textclient (917-1) stable; urgency=low
+
+  * new release
+
+ -- Wilfried Goesgens <w.goesgens@outgesourced.org>  Wed, 03 Jan 2018 16:57:49 -0500
+
 textclient (9.16-1) stable; urgency=low
 
   * new release

diff --git a/webcit/debian/changelog b/webcit/debian/changelog
index f84c5d122a0dd28b036b39e74aec06a384b53a8a..f8fe2ef3e0c82eebf9948aff51223ffc8bd15593 100644 (file)
--- a/webcit/debian/changelog
+++ b/webcit/debian/changelog
@@ -1,3 +1,9 @@
+webcit (917-1) stable; urgency=low
+
+  * new release
+
+ -- Wilfried Goesgens <w.goesgens@outgesourced.org>  Wed, 03 Jan 2018 16:57:49 -0500
+
 webcit (9.16-1) stable; urgency=low
 
   * new release

diff --git a/webcit/webcit.h b/webcit/webcit.h
index 9662f973c2001b8375fc16c887f5d8dd317dc337..cc700fa7e6da9302e210e2b2ffd4a795456eb7cc 100644 (file)
--- a/webcit/webcit.h
+++ b/webcit/webcit.h
@@ -127,8 +127,8 @@ extern char *ssl_cipher_list;
 #define PORT_NUM               2000            /* port number to listen on */
 #define DEVELOPER_ID           0
 #define CLIENT_ID              4
-#define CLIENT_VERSION         916             /* This version of WebCit */
-#define MINIMUM_CIT_VERSION    914             /* Minimum required version of Citadel server */
+#define CLIENT_VERSION         917             /* This version of WebCit */
+#define MINIMUM_CIT_VERSION    917             /* Minimum required version of Citadel server */
 #define        LIBCITADEL_MIN          914             /* Minimum required version of libcitadel */
 #define DEFAULT_HOST           "localhost"     /* Default Citadel server */
 #define DEFAULT_PORT           "504"