From e4790bb016d0c17ea3dd310f8d845d24076413e8 Mon Sep 17 00:00:00 2001 From: Wilfried Goesgens Date: Sat, 7 Dec 2013 11:47:05 +0100 Subject: [PATCH] flip version to 8.29 for master branch so we're ahead of stable versions --- citadel/citadel.h | 4 ++-- citadel/configure.ac | 2 +- citadel/debian/changelog | 6 ++++++ citadel/debian/rules | 2 +- libcitadel/configure.in | 4 ++-- libcitadel/debian/changelog | 6 ++++++ libcitadel/lib/libcitadel.h | 2 +- textclient/configure.ac | 2 +- textclient/debian/changelog | 6 ++++++ webcit/configure.ac | 2 +- webcit/debian/changelog | 6 ++++++ webcit/webcit.h | 4 ++-- 12 files changed, 35 insertions(+), 11 deletions(-) diff --git a/citadel/citadel.h b/citadel/citadel.h index df6a1fcf1..83c43e06f 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 821 /* This version */ +#define REV_LEVEL 829 /* This version */ #define REV_MIN 591 /* Oldest compatible database */ #define EXPORT_REV_MIN 760 /* Oldest compatible export files */ -#define LIBCITADEL_MIN 821 /* Minimum required version of libcitadel */ +#define LIBCITADEL_MIN 829 /* 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/configure.ac b/citadel/configure.ac index ac868661f..381f8ddb2 100644 --- a/citadel/configure.ac +++ b/citadel/configure.ac @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. AC_PREREQ(2.52) -AC_INIT([Citadel], [8.21], [http://www.citadel.org/]) +AC_INIT([Citadel], [8.29], [http://www.citadel.org/]) AC_REVISION([$Revision: 5108 $]) AC_CONFIG_SRCDIR([citserver.c]) AC_CONFIG_HEADER(sysdep.h) diff --git a/citadel/debian/changelog b/citadel/debian/changelog index 808a4c7be..a421eed7e 100644 --- a/citadel/debian/changelog +++ b/citadel/debian/changelog @@ -1,3 +1,9 @@ +citadel (8.29-1) stable; urgency=low + + * development prerelease + + -- Wilfried Goesgens Sat, 07 Dec 2013 11:41:23 +0100 + citadel (8.21-1) stable; urgency=low * new release diff --git a/citadel/debian/rules b/citadel/debian/rules index 25eecb1e7..431f8985a 100755 --- a/citadel/debian/rules +++ b/citadel/debian/rules @@ -59,7 +59,7 @@ ifneq (,$(findstring cares,$(DEB_BUILD_OPTIONS))) endif ifneq (,$(findstring iodbg,$(DEB_BUILD_OPTIONS))) - CFLAGS += -D BIGBAD_IODBG + CFLAGS += -D BIGBAD_IODBG -D LDAP_INITIALIZE endif ifneq (,$(findstring gcov,$(DEB_BUILD_OPTIONS))) diff --git a/libcitadel/configure.in b/libcitadel/configure.in index c0abf5be6..5e332a220 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, 4.8.21, http://uncensored.citadel.org) +AC_INIT(libcitadel, 4.8.29, http://uncensored.citadel.org) AC_CONFIG_SRCDIR(Makefile.in) AC_CONFIG_AUX_DIR(conftools) @@ -23,7 +23,7 @@ dnl If the API changes incompatibly set LIBAGE back to 0 dnl LIBCURRENT=4 -LIBREVISION=821 +LIBREVISION=829 LIBAGE=0 sinclude(conftools/libtool.m4) diff --git a/libcitadel/debian/changelog b/libcitadel/debian/changelog index f8fac503b..d2f0708a2 100644 --- a/libcitadel/debian/changelog +++ b/libcitadel/debian/changelog @@ -1,3 +1,9 @@ +libcitadel (8.29-1) stable; urgency=low + + * development prerelease + + -- Wilfried Goesgens Sat, 07 Dec 2013 11:41:23 +0100 + libcitadel (8.21-1) stable; urgency=low * new release diff --git a/libcitadel/lib/libcitadel.h b/libcitadel/lib/libcitadel.h index 6d4e2181c..b36f8314d 100644 --- a/libcitadel/lib/libcitadel.h +++ b/libcitadel/lib/libcitadel.h @@ -28,7 +28,7 @@ #include #include -#define LIBCITADEL_VERSION_NUMBER 821 +#define LIBCITADEL_VERSION_NUMBER 829 /* * Here's a bunch of stupid magic to make the MIME parser portable. diff --git a/textclient/configure.ac b/textclient/configure.ac index f1b8e9f68..c967b6308 100644 --- a/textclient/configure.ac +++ b/textclient/configure.ac @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. AC_PREREQ(2.52) -AC_INIT([Citadel], [8.21], [http://www.citadel.org/]) +AC_INIT([Citadel], [8.29], [http://www.citadel.org/]) AC_REVISION([$Revision: 5108 $]) AC_CONFIG_HEADER(sysdep.h) diff --git a/textclient/debian/changelog b/textclient/debian/changelog index aebb52be7..76a46ee86 100644 --- a/textclient/debian/changelog +++ b/textclient/debian/changelog @@ -1,3 +1,9 @@ +textclient (8.29-1) stable; urgency=low + + * development prerelease + + -- Wilfried Goesgens Sat, 07 Dec 2013 11:41:23 +0100 + textclient (8.21-1) stable; urgency=low * new upstream version diff --git a/webcit/configure.ac b/webcit/configure.ac index ce2bbcb1b..4f4ad598e 100644 --- a/webcit/configure.ac +++ b/webcit/configure.ac @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. dnl $Id$ -AC_INIT([WebCit], [8.21], [http://www.citadel.org/]) +AC_INIT([WebCit], [8.29], [http://www.citadel.org/]) AC_SUBST(PROG_SUBDIRS) diff --git a/webcit/debian/changelog b/webcit/debian/changelog index 2e3b3e3ff..325696725 100644 --- a/webcit/debian/changelog +++ b/webcit/debian/changelog @@ -1,3 +1,9 @@ +webcit (8.29-1) stable; urgency=low + + * development prerelease + + -- Wilfried Goesgens Sat, 07 Dec 2013 11:41:23 +0100 + webcit (8.21-1) stable; urgency=low * new release diff --git a/webcit/webcit.h b/webcit/webcit.h index 0313da21e..6a8d03400 100644 --- a/webcit/webcit.h +++ b/webcit/webcit.h @@ -132,8 +132,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 821 /* This version of WebCit */ -#define MINIMUM_CIT_VERSION 821 /* Minimum required version of Citadel server */ +#define CLIENT_VERSION 829 /* This version of WebCit */ +#define MINIMUM_CIT_VERSION 829 /* Minimum required version of Citadel server */ #define LIBCITADEL_MIN 821 /* Minimum required version of libcitadel */ #define DEFAULT_HOST "localhost" /* Default Citadel server */ #define DEFAULT_PORT "504" -- 2.30.2