* apply the release stuff to head too from r8127

diff --git a/citadel/citadel.h b/citadel/citadel.h
index 2608cb9a16fa783577c1d97216c1b7e26d083c64..ff484f3b95d2538a02ac53f3a7065ff32bd1f37a 100644 (file)
--- a/citadel/citadel.h
+++ b/citadel/citadel.h
@@ -54,10 +54,10 @@ extern "C" {
  * usually more strict because you're not really supposed to dump/load and
  * upgrade at the same time.
  */
-#define REV_LEVEL      766             /* This version */
+#define REV_LEVEL      770             /* This version */
 #define REV_MIN                591             /* Oldest compatible database */
 #define EXPORT_REV_MIN 760             /* Oldest compatible export files */
-#define LIBCITADEL_MIN 766             /* Minimum required version of libcitadel */
+#define LIBCITADEL_MIN 770             /* 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 362e6496696f178726da24c3920c2065511cdf49..ccd615106d0f8f55d96847a6f9390be72f244c06 100644 (file)
--- a/citadel/configure.ac
+++ b/citadel/configure.ac
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 dnl $Id$
 AC_PREREQ(2.52)
-AC_INIT([Citadel], [7.66], [http://www.citadel.org/])
+AC_INIT([Citadel], [7.70], [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 6f30d87cf87f279bcaebad64e4b3a6a63b69ad29..6624f943752e66134dbdd310e7cfdb3c48e37d70 100644 (file)
--- a/citadel/debian/changelog
+++ b/citadel/debian/changelog
@@ -1,8 +1,8 @@
-citadel (7.67-87) stable; urgency=low
+citadel (7.70-87) stable; urgency=low
 
-  * under construction
+  * new upstream version
 
- -- Wilfried Goesgens <w.goesgens@outgesourced.org>  Mon, 28 Sep 2009 18:00:00 +0001
+ -- Wilfried Goesgens <w.goesgens@outgesourced.org>  Mon, 22 Dec 2009 22:00:00 +0001
 
 citadel (7.66-86) stable; urgency=low
 

diff --git a/libcitadel/configure.in b/libcitadel/configure.in
index 6973ace201e853dc2aa02a40aa4292d3f1616986..b22ca13abab44871c8585e11ef9131b56b1bd5ad 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, 7.66, https://uncensored.citadel.org)
+AC_INIT(libcitadel, 7.70, https://uncensored.citadel.org)
 
 AC_CONFIG_SRCDIR(Makefile.in)
 AC_CONFIG_AUX_DIR(conftools)

diff --git a/libcitadel/debian/changelog b/libcitadel/debian/changelog
index ab641dca3a96a2bff3f482694b016a0dabce933e..89a20b553e9fe9aad208657a38c4993e56b5d3e4 100644 (file)
--- a/libcitadel/debian/changelog
+++ b/libcitadel/debian/changelog
@@ -1,3 +1,9 @@
+libcitadel (7.70-86) unstable; urgency=low
+
+  * new release
+
+ -- Wilfried Goesgens <w.goesgens@outgesourced.org>  Tue, 16 Dec 2009 22:00:00 +0002
+
 libcitadel (7.67-85) unstable; urgency=low
 
   * new release

diff --git a/libcitadel/lib/libcitadel.h b/libcitadel/lib/libcitadel.h
index fcb009be6a58bc87ada3ce95409aab3949bc378c..8c6f726a7e04f8ed59a2869478c25114c2bf6a77 100644 (file)
--- a/libcitadel/lib/libcitadel.h
+++ b/libcitadel/lib/libcitadel.h
@@ -15,7 +15,7 @@
 #include <time.h>
 #include <stdlib.h>
 #include <stdarg.h>
-#define LIBCITADEL_VERSION_NUMBER      766
+#define LIBCITADEL_VERSION_NUMBER      770
 
 /*
  * Here's a bunch of stupid magic to make the MIME parser portable.

diff --git a/webcit/configure.ac b/webcit/configure.ac
index 32aa525baca04f5f06e9b94b58fe0b03af912d7a..3f576e8818d819b8119cb698ae7ca645498f83ae 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], [7.66], [http://www.citadel.org/])
+AC_INIT([WebCit], [7.70], [http://www.citadel.org/])
 
 
 AC_SUBST(PROG_SUBDIRS)

diff --git a/webcit/debian/changelog b/webcit/debian/changelog
index 034307288cbefaa2e2ba62eb41dee21bb402cfd0..5f463c03a8e6c3dafecc488ca126d7ca4870f8d3 100644 (file)
--- a/webcit/debian/changelog
+++ b/webcit/debian/changelog
@@ -1,3 +1,15 @@
+webcit (7.70-88) stable; urgency=low
+
+  * new release
+
+ -- Wilfried Goesgens <w.goesgens@outgesourced.org>  Wed, 16 Dec 2009 22:00:00 +0001
+
+webcit (7.66-87) stable; urgency=low
+
+  * new release
+
+ -- Wilfried Goesgens <w.goesgens@outgesourced.org>  Mon, 28 Sep 2009 18:00:00 +0001
+
 webcit (7.65-86) stable; urgency=low
 
   * more fixes

diff --git a/webcit/webcit.h b/webcit/webcit.h
index a9746f93e36439cc41058f41914c65250e6d3387..72b489586be62c13861ac2c1ef52accaf5895499 100644 (file)
--- a/webcit/webcit.h
+++ b/webcit/webcit.h
@@ -115,8 +115,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         766             /* This version of WebCit */
-#define MINIMUM_CIT_VERSION    766             /* min required Citadel ver */
+#define CLIENT_VERSION         770             /* This version of WebCit */
+#define MINIMUM_CIT_VERSION    770             /* min required Citadel ver */
 #define        LIBCITADEL_MIN          766             /* min required libcitadel ver */
 #define DEFAULT_HOST           "localhost"     /* Default Citadel server */
 #define DEFAULT_PORT           "504"