Set version numbers and copyright dates for 8.04 release

diff --git a/citadel/citadel.h b/citadel/citadel.h
index dbef91b2909ef40a171c710aad25d94746274d21..e0bd35542a01b283b6f570c58e41c75a8c12ada2 100644 (file)
--- a/citadel/citadel.h
+++ b/citadel/citadel.h
@@ -1,12 +1,10 @@
 /*
  * Main Citadel header file
  *
- * Copyright (c) 1987-2011 by the citadel.org team
+ * Copyright (c) 1987-2012 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
- * 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 version 3.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -51,10 +49,10 @@ extern "C" {
  * usually more strict because you're not really supposed to dump/load and
  * upgrade at the same time.
  */
-#define REV_LEVEL      803             /* This version */
+#define REV_LEVEL      804             /* This version */
 #define REV_MIN                591             /* Oldest compatible database */
 #define EXPORT_REV_MIN 760             /* Oldest compatible export files */
-#define LIBCITADEL_MIN 802             /* Minimum required version of libcitadel */
+#define LIBCITADEL_MIN 804             /* 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 5a49e25ff1202d64cf1ac004da0643aec16be3e7..49b7cdf95306cf14d33da8592f0251eaf4360083 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)
-AC_INIT([Citadel], [8.03], [http://www.citadel.org/])
+AC_INIT([Citadel], [8.04], [http://www.citadel.org/])
 AC_REVISION([$Revision: 5108 $])
 AC_CONFIG_SRCDIR([citserver.c])
 AC_CONFIG_HEADER(sysdep.h)

diff --git a/citadel/server_main.c b/citadel/server_main.c
index d1b2a4cd3cb4c9edb8f5915adb2bc1d50e08f9c4..592ea7708bbc620f518e10eb21af59406b86642d 100644 (file)
--- a/citadel/server_main.c
+++ b/citadel/server_main.c
@@ -1,21 +1,15 @@
 /*
  * citserver's main() function lives here.
  * 
- * Copyright (c) 1987-2011 by the citadel.org team
+ * Copyright (c) 1987-2012 by the citadel.org team
  *
  * 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 version 3.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
 #include "sysdep.h"
@@ -208,7 +202,7 @@ int main(int argc, char **argv)
        syslog(LOG_NOTICE,
                "*** Citadel server engine v%d.%02d (build %s) ***",
                (REV_LEVEL/100), (REV_LEVEL%100), svn_revision());
-       syslog(LOG_NOTICE, "Copyright (C) 1987-2011 by the Citadel development team.");
+       syslog(LOG_NOTICE, "Copyright (C) 1987-2012 by the Citadel development team.");
        syslog(LOG_NOTICE, "This program is distributed under the terms of the GNU "
                                        "General Public License.");
        syslog(LOG_NOTICE, " ");

diff --git a/libcitadel/configure.in b/libcitadel/configure.in
index ec3ced083d6fcad7e4247679ed2442aab43715c3..608f45f06eaa62cef197be183e9765ca41d191ba 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, 8.02, http://uncensored.citadel.org)
+AC_INIT(libcitadel, 8.04, http://uncensored.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 56872ae9610014609df4d8804ca6442cbe2598ac..b9653414ee4466bb25fb8172f9256f35fa73b601 100644 (file)
--- a/libcitadel/lib/libcitadel.h
+++ b/libcitadel/lib/libcitadel.h
@@ -16,7 +16,7 @@
 #include <stdarg.h>
 #include <arpa/inet.h>
 
-#define LIBCITADEL_VERSION_NUMBER      802
+#define LIBCITADEL_VERSION_NUMBER      804
 
 /*
  * Here's a bunch of stupid magic to make the MIME parser portable.

diff --git a/webcit/README.txt b/webcit/README.txt
index 95653514d6a990c559076fe8e28b1aba4e356760..aa8f6061fddcc2af4e0a05eafd855431d6eb015d 100644 (file)
--- a/webcit/README.txt
+++ b/webcit/README.txt
@@ -1,6 +1,6 @@
                         WEBCIT for the Citadel System
  
-   Copyright (C) 1996-2011 by the authors.  Portions written by:
+   Copyright (C) 1996-2012 by the authors.  Portions written by:
  
        Art Cancro
        Wilfried Goesgens

diff --git a/webcit/configure.ac b/webcit/configure.ac
index e41910c47cb264cfd38674e43034a313926fa999..00bd6e0e4ea54186358c260a4ccbbe2c64d149cf 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], [8.03], [http://www.citadel.org/])
+AC_INIT([WebCit], [8.04], [http://www.citadel.org/])
 
 
 AC_SUBST(PROG_SUBDIRS)

diff --git a/webcit/webcit.h b/webcit/webcit.h
index bfad761078615c157be9d30a51d39be0566b6296..4cb99869fb554d6d63fe936c5ef9c2ceedd4ff62 100644 (file)
--- a/webcit/webcit.h
+++ b/webcit/webcit.h
@@ -1,10 +1,8 @@
 /*
- * Copyright (c) 1987-2011 by the citadel.org team
+ * Copyright (c) 1987-2012 by the citadel.org team
  *
  * 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.
+ * modify it under the terms of the GNU General Public License version 3.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -135,9 +133,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         802             /* This version of WebCit */
-#define MINIMUM_CIT_VERSION    802             /* min required Citadel ver */
-#define        LIBCITADEL_MIN          802             /* min required libcitadel ver */
+#define CLIENT_VERSION         804             /* This version of WebCit */
+#define MINIMUM_CIT_VERSION    804             /* min required Citadel ver */
+#define        LIBCITADEL_MIN          804             /* min required libcitadel ver */
 #define DEFAULT_HOST           "localhost"     /* Default Citadel server */
 #define DEFAULT_PORT           "504"
 #define TARGET                 "webcit01"      /* Target for inline URL's */