From c08adcea52e85d6139ad158c17eb3d1941df2eb5 Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Mon, 11 Apr 2011 10:03:53 -0400 Subject: [PATCH] Tag stable-78x for 7.86 release --- citadel/COPYING | 2 +- citadel/citadel.h | 4 ++-- citadel/configure.ac | 2 +- libcitadel/COPYING | 2 +- libcitadel/configure.in | 2 +- libcitadel/lib/libcitadel.h | 2 +- webcit/COPYING | 2 +- webcit/configure.ac | 2 +- webcit/webcit.h | 6 +++--- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/citadel/COPYING b/citadel/COPYING index 6267e54de..181d56d3b 100644 --- a/citadel/COPYING +++ b/citadel/COPYING @@ -37,7 +37,7 @@ Copyright for RFC 2739 openldap schema: Preamble - The GNU General Public License is a free, copyleft license for + The GNU General Public License is an open source license for software and other kinds of works. The licenses for most software and other practical works are designed diff --git a/citadel/citadel.h b/citadel/citadel.h index 9813272e0..e94eebe62 100644 --- a/citadel/citadel.h +++ b/citadel/citadel.h @@ -53,10 +53,10 @@ extern "C" { * usually more strict because you're not really supposed to dump/load and * upgrade at the same time. */ -#define REV_LEVEL 785 /* This version */ +#define REV_LEVEL 786 /* This version */ #define REV_MIN 591 /* Oldest compatible database */ #define EXPORT_REV_MIN 760 /* Oldest compatible export files */ -#define LIBCITADEL_MIN 785 /* Minimum required version of libcitadel */ +#define LIBCITADEL_MIN 786 /* 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 f99752f5e..52241a1d1 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.85], [http://www.citadel.org/]) +AC_INIT([Citadel], [7.86], [http://www.citadel.org/]) AC_REVISION([$Revision: 5108 $]) AC_CONFIG_SRCDIR([citserver.c]) AC_CONFIG_HEADER(sysdep.h) diff --git a/libcitadel/COPYING b/libcitadel/COPYING index 41698e90b..261ff4c6a 100644 --- a/libcitadel/COPYING +++ b/libcitadel/COPYING @@ -47,7 +47,7 @@ LibCitadel is courtesy of the citadel development team: Preamble - The GNU General Public License is a free, copyleft license for + The GNU General Public License is an open source license for software and other kinds of works. The licenses for most software and other practical works are designed diff --git a/libcitadel/configure.in b/libcitadel/configure.in index cad1043bd..77b2c54d7 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.85, http://www.citadel.org) +AC_INIT(libcitadel, 7.86, http://www.citadel.org) AC_CONFIG_SRCDIR(Makefile.in) AC_CONFIG_AUX_DIR(conftools) diff --git a/libcitadel/lib/libcitadel.h b/libcitadel/lib/libcitadel.h index e7fe21d1c..dc921fef3 100644 --- a/libcitadel/lib/libcitadel.h +++ b/libcitadel/lib/libcitadel.h @@ -10,7 +10,7 @@ #include #include #include -#define LIBCITADEL_VERSION_NUMBER 785 +#define LIBCITADEL_VERSION_NUMBER 786 /* * Here's a bunch of stupid magic to make the MIME parser portable. diff --git a/webcit/COPYING b/webcit/COPYING index 8e9c34fec..0d967cd1b 100644 --- a/webcit/COPYING +++ b/webcit/COPYING @@ -42,7 +42,7 @@ TinyMCE: Moxiecode tinymce.org LGPL V2.1 or later Preamble - The GNU General Public License is a free, copyleft license for + The GNU General Public License is an open source license for software and other kinds of works. The licenses for most software and other practical works are designed diff --git a/webcit/configure.ac b/webcit/configure.ac index 8f34adef3..820f91dc2 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.85], [http://www.citadel.org/]) +AC_INIT([WebCit], [7.86], [http://www.citadel.org/]) AC_SUBST(PROG_SUBDIRS) diff --git a/webcit/webcit.h b/webcit/webcit.h index c1c74a624..5ba500b2b 100644 --- a/webcit/webcit.h +++ b/webcit/webcit.h @@ -137,9 +137,9 @@ 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 785 /* This version of WebCit */ -#define MINIMUM_CIT_VERSION 785 /* min required Citadel ver */ -#define LIBCITADEL_MIN 785 /* min required libcitadel ver */ +#define CLIENT_VERSION 786 /* This version of WebCit */ +#define MINIMUM_CIT_VERSION 786 /* min required Citadel ver */ +#define LIBCITADEL_MIN 786 /* min required libcitadel ver */ #define DEFAULT_HOST "localhost" /* Default Citadel server */ #define DEFAULT_PORT "504" #define TARGET "webcit01" /* Target for inline URL's */ -- 2.30.2