From f3ea7e42ffad69e9e00213691039c0ed1d5a8ff6 Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Wed, 3 Jan 2018 16:58:23 -0500 Subject: [PATCH] releaseversion.sh simplified to handle integer version numbers --- citadel/citadel.h | 4 ++-- citadel/debian/changelog | 6 ++++++ libcitadel/configure.in | 4 ++-- libcitadel/debian/changelog | 6 ++++++ libcitadel/lib/libcitadel.h | 2 +- releaseversion.sh | 2 +- textclient/debian/changelog | 6 ++++++ webcit/debian/changelog | 6 ++++++ webcit/webcit.h | 4 ++-- 9 files changed, 32 insertions(+), 8 deletions(-) diff --git a/citadel/citadel.h b/citadel/citadel.h index b15e01527..6e9e09ff3 100644 --- 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 9509169f0..a192d46f9 100644 --- a/citadel/debian/changelog +++ b/citadel/debian/changelog @@ -1,3 +1,9 @@ +citadel (917-1) stable; urgency=low + + * new release + + -- Wilfried Goesgens 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 14db2bc74..a39b6d468 100755 --- 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 61c8344b2..34abd45d0 100644 --- a/libcitadel/debian/changelog +++ b/libcitadel/debian/changelog @@ -1,3 +1,9 @@ +libcitadel (917-1) stable; urgency=low + + * new release + + -- Wilfried Goesgens 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 70e9857c5..a6d66c5ec 100644 --- a/libcitadel/lib/libcitadel.h +++ b/libcitadel/lib/libcitadel.h @@ -28,7 +28,7 @@ #include #include -#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 74008fca6..b0311c23c 100755 --- 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 7c148d67d..38b455c16 100644 --- a/textclient/debian/changelog +++ b/textclient/debian/changelog @@ -1,3 +1,9 @@ +textclient (917-1) stable; urgency=low + + * new release + + -- Wilfried Goesgens 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 f84c5d122..f8fe2ef3e 100644 --- a/webcit/debian/changelog +++ b/webcit/debian/changelog @@ -1,3 +1,9 @@ +webcit (917-1) stable; urgency=low + + * new release + + -- Wilfried Goesgens 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 9662f973c..cc700fa7e 100644 --- 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" -- 2.30.2