flip version to 8.29 for master branch so we're ahead of stable versions

diff --git a/citadel/citadel.h b/citadel/citadel.h
index df6a1fcf112aa0968dd671eb4bc33a3b31db49e9..83c43e06f61b5e8fab222fbec30a50b98a1baad2 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      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 ac868661f553f3e9a6d0739e7e074e871448de2a..381f8ddb209e6597d85af1dade7c1ec069f613d3 100644 (file)
--- 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 808a4c7be4813a6ec004cbb741cbcd3427e57aa7..a421eed7e5f11fcdf06c66ba121c286b1ff0b145 100644 (file)
--- a/citadel/debian/changelog
+++ b/citadel/debian/changelog
@@ -1,3 +1,9 @@
+citadel (8.29-1) stable; urgency=low
+
+  * development prerelease
+
+ -- Wilfried Goesgens <w.goesgens@outgesourced.org>  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 25eecb1e7144cbce05f921ab5a5de45b3d6fb71d..431f8985a6c4c289a468dc2b65d0862513b0b307 100755 (executable)
--- 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 c0abf5be687a12086f3f0bbda3cc5d66beb4501e..5e332a22024f3f7dff659871565012b8e96fac23 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, 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 f8fac503b718426605e37870fb07dc59a6805b56..d2f0708a25de4ce2241288162bd1012ff38e93ce 100644 (file)
--- a/libcitadel/debian/changelog
+++ b/libcitadel/debian/changelog
@@ -1,3 +1,9 @@
+libcitadel (8.29-1) stable; urgency=low
+
+  * development prerelease
+
+ -- Wilfried Goesgens <w.goesgens@outgesourced.org>  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 6d4e2181cb26b4ebb315179619c5c1eb168835ee..b36f8314d26faafb04784638eabaf815063b9589 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      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 f1b8e9f6835d77b44bb768eb1fe540da2634cc3a..c967b6308333b0462d0cba61fd08d02f8bd98514 100644 (file)
--- 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 aebb52be7d1e88a270d242ff6f17e6dfe7704c8f..76a46ee86fe7e448db3bb0aecc48753445e40779 100644 (file)
--- a/textclient/debian/changelog
+++ b/textclient/debian/changelog
@@ -1,3 +1,9 @@
+textclient (8.29-1) stable; urgency=low
+
+  * development prerelease
+
+ -- Wilfried Goesgens <w.goesgens@outgesourced.org>  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 ce2bbcb1b42e5299424d04e3651812acaaa256d8..4f4ad598e8161ea309050ab6ec391e8ec5e334e6 100644 (file)
--- 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 2e3b3e3ff56c70cb726d94c2c541c146e524f762..32569672537386b7c0617d1e371d8266daa680b9 100644 (file)
--- a/webcit/debian/changelog
+++ b/webcit/debian/changelog
@@ -1,3 +1,9 @@
+webcit (8.29-1) stable; urgency=low
+
+  * development prerelease
+
+ -- Wilfried Goesgens <w.goesgens@outgesourced.org>  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 0313da21e0d1c3367ba74162772b8fb3a5d5461f..6a8d034000d2f31449ac5c5d14e527c8a61f4624 100644 (file)
--- 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"