From 8e06cc28654bde788aa7e62d93f0ce970b838d49 Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Tue, 10 Jan 2012 12:44:09 -0500 Subject: [PATCH] Set version numbers and copyright dates for 8.04 release --- citadel/citadel.h | 10 ++++------ citadel/configure.ac | 2 +- citadel/server_main.c | 12 +++--------- libcitadel/configure.in | 2 +- libcitadel/lib/libcitadel.h | 2 +- webcit/README.txt | 2 +- webcit/configure.ac | 2 +- webcit/webcit.h | 12 +++++------- 8 files changed, 17 insertions(+), 27 deletions(-) diff --git a/citadel/citadel.h b/citadel/citadel.h index dbef91b29..e0bd35542 100644 --- 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 5a49e25ff..49b7cdf95 100644 --- 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 d1b2a4cd3..592ea7708 100644 --- 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 ec3ced083..608f45f06 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, 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 56872ae96..b9653414e 100644 --- a/libcitadel/lib/libcitadel.h +++ b/libcitadel/lib/libcitadel.h @@ -16,7 +16,7 @@ #include #include -#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 95653514d..aa8f6061f 100644 --- 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 e41910c47..00bd6e0e4 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], [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 bfad76107..4cb99869f 100644 --- 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 */ -- 2.30.2