Tag stable-78x for 7.86 release

diff --git a/citadel/COPYING b/citadel/COPYING
index 6267e54de555ba311b032833dfb1ee1aef27ccc3..181d56d3bde9bc5dd2dd2a42b977edae71cf4063 100644 (file)
--- a/citadel/COPYING
+++ b/citadel/COPYING
@@ -37,7 +37,7 @@ Copyright for RFC 2739 openldap schema:
 
                             Preamble
 
 
                             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
 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 9813272e05ce3d9804a4791169d9935ef1cab340..e94eebe62cdb535d0bd2a8a06ee8c4c09b320b64 100644 (file)
--- 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.
  */
  * 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 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 */
 
 #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 f99752f5e2f274761c4d6ad481a75ca11d91f51e..52241a1d129f691a3054be346ef8c3e982214f3d 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)
 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)
 AC_REVISION([$Revision: 5108 $])
 AC_CONFIG_SRCDIR([citserver.c])
 AC_CONFIG_HEADER(sysdep.h)

diff --git a/libcitadel/COPYING b/libcitadel/COPYING
index 41698e90b27e1751aa071b9ca8852edc3dfe02e9..261ff4c6acf872be2f341d4fcaad0cfd444fa730 100644 (file)
--- a/libcitadel/COPYING
+++ b/libcitadel/COPYING
@@ -47,7 +47,7 @@ LibCitadel is courtesy of the citadel development team:
 
                             Preamble
 
 
                             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
 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 cad1043bd21bec5a9438ee84fa3f32c694dc4078..77b2c54d7382ec97e1a241f6d96bea2efe37263d 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)
 
 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)
 
 AC_CONFIG_SRCDIR(Makefile.in)
 AC_CONFIG_AUX_DIR(conftools)

diff --git a/libcitadel/lib/libcitadel.h b/libcitadel/lib/libcitadel.h
index e7fe21d1cbe2852bc44d35e97b214e2ac58bc471..dc921fef3659384bbe38dda9b4b1899751cf1c48 100644 (file)
--- a/libcitadel/lib/libcitadel.h
+++ b/libcitadel/lib/libcitadel.h
@@ -10,7 +10,7 @@
 #include <time.h>
 #include <stdlib.h>
 #include <stdarg.h>
 #include <time.h>
 #include <stdlib.h>
 #include <stdarg.h>

-#define LIBCITADEL_VERSION_NUMBER      785
+#define LIBCITADEL_VERSION_NUMBER      786

 
 /*
  * Here's a bunch of stupid magic to make the MIME parser portable.
 
 /*
  * Here's a bunch of stupid magic to make the MIME parser portable.

diff --git a/webcit/COPYING b/webcit/COPYING
index 8e9c34fec31919ea382adce4ec355d02700c34e3..0d967cd1b851e6119fa30a6f3969b26b52231a04 100644 (file)
--- a/webcit/COPYING
+++ b/webcit/COPYING
@@ -42,7 +42,7 @@ TinyMCE: Moxiecode tinymce.org LGPL V2.1 or later
 
                             Preamble
 
 
                             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
 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 8f34adef32944e21b57500c8c294df1f05e917c2..820f91dc2a9702012412414830ea9a728087078d 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$
 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)
 
 
 AC_SUBST(PROG_SUBDIRS)

diff --git a/webcit/webcit.h b/webcit/webcit.h
index c1c74a62498fa1f274b7e70972af4b400f7d2673..5ba500b2b73cf58c9ba9b6ec244009fe05fb0640 100644 (file)
--- 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 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 */
 #define DEFAULT_HOST           "localhost"     /* Default Citadel server */
 #define DEFAULT_PORT           "504"
 #define TARGET                 "webcit01"      /* Target for inline URL's */