From 6d0104340486630cc70446dd6d279a289bbae182 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Wilfried=20G=C3=B6esgens?= Date: Mon, 21 Dec 2009 12:38:16 +0000 Subject: [PATCH] * apply the release stuff to head too from r8127 --- citadel/citadel.h | 4 ++-- citadel/configure.ac | 2 +- citadel/debian/changelog | 6 +++--- libcitadel/configure.in | 2 +- libcitadel/debian/changelog | 6 ++++++ libcitadel/lib/libcitadel.h | 2 +- webcit/configure.ac | 2 +- webcit/debian/changelog | 12 ++++++++++++ webcit/webcit.h | 4 ++-- 9 files changed, 29 insertions(+), 11 deletions(-) diff --git a/citadel/citadel.h b/citadel/citadel.h index 2608cb9a1..ff484f3b9 100644 --- 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 362e64966..ccd615106 100644 --- 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 6f30d87cf..6624f9437 100644 --- 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 Mon, 28 Sep 2009 18:00:00 +0001 + -- Wilfried Goesgens 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 6973ace20..b22ca13ab 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, 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 ab641dca3..89a20b553 100644 --- a/libcitadel/debian/changelog +++ b/libcitadel/debian/changelog @@ -1,3 +1,9 @@ +libcitadel (7.70-86) unstable; urgency=low + + * new release + + -- Wilfried Goesgens 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 fcb009be6..8c6f726a7 100644 --- a/libcitadel/lib/libcitadel.h +++ b/libcitadel/lib/libcitadel.h @@ -15,7 +15,7 @@ #include #include #include -#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 32aa525ba..3f576e881 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], [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 034307288..5f463c03a 100644 --- a/webcit/debian/changelog +++ b/webcit/debian/changelog @@ -1,3 +1,15 @@ +webcit (7.70-88) stable; urgency=low + + * new release + + -- Wilfried Goesgens Wed, 16 Dec 2009 22:00:00 +0001 + +webcit (7.66-87) stable; urgency=low + + * new release + + -- Wilfried Goesgens 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 a9746f93e..72b489586 100644 --- 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" -- 2.30.2