Version number to 8.02 for upcoming release

diff --git a/citadel/citadel.h b/citadel/citadel.h
index f3ef0ceb0c0426a59fed397846b0209eb8ffd21e..03c71a7eafdec32659c3506a682395a767e960b2 100644 (file)
--- a/citadel/citadel.h
+++ b/citadel/citadel.h
@@ -1,7 +1,7 @@
 /*
  * Main Citadel header file
  *
 /*
  * Main Citadel header file
  *

- * Copyright (c) 1987-2010 by the citadel.org team
+ * Copyright (c) 1987-2011 by the citadel.org team

  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by


@@ -51,10 +51,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      801             /* This version */
+#define REV_LEVEL      802             /* 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 801             /* Minimum required version of libcitadel */
+#define LIBCITADEL_MIN 802             /* 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 dbe59677ed1dc840567f862ab8c392bd2bcb3bf4..0dd0792658070efa8df219b6f7862a9a157717c6 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)
 dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.52)

-AC_INIT([Citadel], [8.01], [http://www.citadel.org/])
+AC_INIT([Citadel], [8.02], [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/citadel/debian/changelog b/citadel/debian/changelog
index 1edc07d436a55b27640a6d96094fb9c6280bc767..bc73b94e0bddda5f5e9ddee018412889113a3011 100644 (file)
--- a/citadel/debian/changelog
+++ b/citadel/debian/changelog
@@ -1,3 +1,9 @@
+citadel (8.02-1) stable; urgency=low
+
+  * new upstream version
+
+ -- Wilfried Goesgens <w.goesgens@outgesourced.org>  Fri, 11 Nov 2011 22:00:00 +0001
+

 citadel (7.83-91) stable; urgency=low
 
   * new upstream version
 citadel (7.83-91) stable; urgency=low
 
   * new upstream version

diff --git a/citadel/ldap.c b/citadel/ldap.c
index baa123aebc67441233428f7a90ca1d1668bff012..cc88a7b4e202fdbfdfd5412ab1efc39ac1853e5f 100644 (file)
--- a/citadel/ldap.c
+++ b/citadel/ldap.c
@@ -2,9 +2,9 @@
  * These functions implement the portions of AUTHMODE_LDAP and AUTHMODE_LDAP_AD which
  * actually speak to the LDAP server.
  *
  * These functions implement the portions of AUTHMODE_LDAP and AUTHMODE_LDAP_AD which
  * actually speak to the LDAP server.
  *

- * Copyright (c) 2010 by Art Cancro and the citadel.org development team.
+ * Copyright (c) 2011 by Art Cancro and the citadel.org development team.

  *
  *

- * This program is free software; you can redistribute it and/or modify
+ * This program is open source software; you can redistribute it and/or modify

  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.

diff --git a/citadel/parsedate.c b/citadel/parsedate.c
index 2df743a7750b424da971c289f22b7361c03f1efd..ef584417fb8cca830b4d2742ca93c1f1ebb0d743 100644 (file)
--- a/citadel/parsedate.c
+++ b/citadel/parsedate.c
@@ -5,8 +5,8 @@
    
       Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
    Free Software Foundation, Inc.
    
       Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
    Free Software Foundation, Inc.

-   
-   This program is free software: you can redistribute it and/or modify
+
+   This program is open source software; you can redistribute it and/or modify

    it under the terms of the GNU General Public License as published by
    the Free Software Foundation, either version 3 of the License, or
    (at your option) any later version.
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation, either version 3 of the License, or
    (at your option) any later version.

diff --git a/libcitadel/configure.in b/libcitadel/configure.in
index bc5e49f42966f4410ac7928f54c0f0b5176a4ce1..71328a0df9027814691e9107c0be81b5fac6f85c 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, 8.01, http://uncensored.citadel.org)
+AC_INIT(libcitadel, 8.02, http://uncensored.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/debian/changelog b/libcitadel/debian/changelog
index 1b9921f88e87ed202b2b908658bbf4f7b2aea5bb..2c04b10345e4d608f9b5654fad9b027c45121f3f 100644 (file)
--- a/libcitadel/debian/changelog
+++ b/libcitadel/debian/changelog
@@ -1,9 +1,14 @@
+libcitadel (8.02-1) stable; urgency=low
+
+  * new release
+
+ -- Wilfried Goesgens <w.goesgens@outgesourced.org>  Fri, 11 Nov 2011 22:00:00 +0001
+

 libcitadel (7.89-99) stable; urgency=low
 
   * pre release
 
  -- Wilfried Goesgens <w.goesgens@outgesourced.org>  Wed, 28 Jul 2010 22:00:00 +0001
 libcitadel (7.89-99) stable; urgency=low
 
   * pre release
 
  -- Wilfried Goesgens <w.goesgens@outgesourced.org>  Wed, 28 Jul 2010 22:00:00 +0001

-

 libcitadel (7.83-91) stable; urgency=low
 
   * new release
 libcitadel (7.83-91) stable; urgency=low
 
   * new release

diff --git a/libcitadel/lib/libcitadel.h b/libcitadel/lib/libcitadel.h
index 4afcbde893b4ba8bfb889f523054d744fbc65e45..a6ebe150a33f39828fa77407f35625ff81bbe5e0 100644 (file)
--- a/libcitadel/lib/libcitadel.h
+++ b/libcitadel/lib/libcitadel.h
@@ -16,7 +16,7 @@
 #include <stdarg.h>
 #include <arpa/inet.h>
 
 #include <stdarg.h>
 #include <arpa/inet.h>
 

-#define LIBCITADEL_VERSION_NUMBER      801
+#define LIBCITADEL_VERSION_NUMBER      802

 
 /*
  * 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/configure.ac b/webcit/configure.ac
index 0a0ea941b20f815edef1d6eae4b4d6102c700484..5745b98b1b329c9c58a739580006103a5e2844ff 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], [8.00], [http://www.citadel.org/])
+AC_INIT([WebCit], [8.02], [http://www.citadel.org/])

 
 
 AC_SUBST(PROG_SUBDIRS)
 
 
 AC_SUBST(PROG_SUBDIRS)

diff --git a/webcit/debian/changelog b/webcit/debian/changelog
index 51e4b894410a74ba089646f9046e9da751fa34af..5aec34301917c697582b7ca8dc4335b6a60f8a0b 100644 (file)
--- a/webcit/debian/changelog
+++ b/webcit/debian/changelog
@@ -1,3 +1,9 @@
+webcit (8.02-1) stable; urgency=low
+
+  * new release
+
+ -- Wilfried Goesgens <w.goesgens@outgesourced.org>  Dri, 11 Nov 2011 22:00:00 +0001
+

 webcit (7.83-91) stable; urgency=low
 
   * new release
 webcit (7.83-91) stable; urgency=low
 
   * new release

diff --git a/webcit/webcit.h b/webcit/webcit.h
index ad5aafc110a7f8fa32b93c557903364b9dad926f..0beda739a51146b6c05eedd3703cdd75fae8a891 100644 (file)
--- a/webcit/webcit.h
+++ b/webcit/webcit.h
@@ -144,9 +144,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         801             /* This version of WebCit */
-#define MINIMUM_CIT_VERSION    801             /* min required Citadel ver */
-#define        LIBCITADEL_MIN          801             /* min required libcitadel ver */
+#define CLIENT_VERSION         802             /* This version of WebCit */
+#define MINIMUM_CIT_VERSION    802             /* min required Citadel ver */
+#define        LIBCITADEL_MIN          802             /* 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 */


@@ -170,31 +170,31 @@ extern char *ssl_cipher_list;
  *
  * bucket one...
  */
  *
  * bucket one...
  */

-#define QR_PERMANENT   1               /* Room does not purge          */
+#define QR_PERMANENT   1               /* Room does not purge                  */

 #define QR_INUSE       2               /* Set if in use, clear if avail        */
 #define QR_PRIVATE     4               /* Set for any type of private room     */
 #define QR_PASSWORDED  8               /* Set if there's a password too        */
 #define QR_INUSE       2               /* Set if in use, clear if avail        */
 #define QR_PRIVATE     4               /* Set for any type of private room     */
 #define QR_PASSWORDED  8               /* Set if there's a password too        */

-#define QR_GUESSNAME   16              /* Set if it's a guessname room */
+#define QR_GUESSNAME   16              /* Set if it's a guessname room         */

 #define QR_DIRECTORY   32              /* Directory room                       */
 #define QR_UPLOAD      64              /* Allowed to upload                    */
 #define QR_DIRECTORY   32              /* Directory room                       */
 #define QR_UPLOAD      64              /* Allowed to upload                    */

-#define QR_DOWNLOAD    128             /* Allowed to download          */
+#define QR_DOWNLOAD    128             /* Allowed to download                  */

 #define QR_VISDIR      256             /* Visible directory                    */
 #define QR_VISDIR      256             /* Visible directory                    */

-#define QR_ANONONLY    512             /* Anonymous-Only room          */
+#define QR_ANONONLY    512             /* Anonymous-Only room                  */

 #define QR_ANONOPT     1024            /* Anonymous-Option room                */
 #define QR_ANONOPT     1024            /* Anonymous-Option room                */

-#define QR_NETWORK     2048            /* Shared network room          */
+#define QR_NETWORK     2048            /* Shared network room                  */

 #define QR_PREFONLY    4096            /* Preferred status needed to enter     */
 #define QR_PREFONLY    4096            /* Preferred status needed to enter     */

-#define QR_READONLY    8192            /* Aide status required to post */
+#define QR_READONLY    8192            /* Aide status required to post         */

 #define QR_MAILBOX     16384           /* Set if this is a private mailbox     */
 
 /*
  * bucket two...
  */
 #define QR_MAILBOX     16384           /* Set if this is a private mailbox     */
 
 /*
  * bucket two...
  */

-#define QR2_SYSTEM     1               /* System room; hide by default */
+#define QR2_SYSTEM     1               /* System room; hide by default         */

 #define QR2_SELFLIST   2               /* Self-service mailing list mgmt       */
 #define QR2_SELFLIST   2               /* Self-service mailing list mgmt       */

-#define QR2_COLLABDEL  4               /* Anyone who can post can also delete*/
-#define QR2_SUBJECTREQ  8               /* Subject strongly recommended */
-#define QR2_SMTP_PUBLIC 16              /* smtp public postable room */
-#define QR2_MODERATED  32              /* Listservice aide has to permit posts  */
+#define QR2_COLLABDEL  4               /* Anyone who can post can also delete  */
+#define QR2_SUBJECTREQ  8               /* Subject strongly recommended                */
+#define QR2_SMTP_PUBLIC 16              /* smtp public postable room           */
+#define QR2_MODERATED  32              /* Listservice aide has to permit posts */

 
 /*
  * user/room access
 
 /*
  * user/room access