From fef8075c28c6fdf09f0f84ec8448cbbe6362bff9 Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Thu, 8 Mar 2012 14:36:02 -0500 Subject: [PATCH] version 8.05 --- citadel/COPYING | 2 +- citadel/citadel.h | 10 +++------- citadel/configure.ac | 2 +- citadel/debian/changelog | 6 ++++++ libcitadel/README.txt | 2 +- libcitadel/configure.in | 2 +- libcitadel/debian/changelog | 6 ++++++ libcitadel/lib/libcitadel.h | 2 +- webcit/configure.ac | 2 +- webcit/debian/changelog | 6 ++++++ webcit/webcit.h | 10 +++------- 11 files changed, 30 insertions(+), 20 deletions(-) diff --git a/citadel/COPYING b/citadel/COPYING index 3b6efd6b0..615bb02da 100644 --- a/citadel/COPYING +++ b/citadel/COPYING @@ -1,5 +1,5 @@ -Copyright: (C) 1987-2010 Citadel development team; GPL V3 +Copyright: (C) 1987-2012 Citadel development team; GPL V3 Copyright for CRC16: (C) 2002-2003 Indigo Systems Corporation; Artistic license + Non advertising clause diff --git a/citadel/citadel.h b/citadel/citadel.h index e0bd35542..4d518d37b 100644 --- a/citadel/citadel.h +++ b/citadel/citadel.h @@ -3,17 +3,13 @@ * * Copyright (c) 1987-2012 by the citadel.org 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 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 */ /* system customizations are in sysconfig.h */ @@ -49,10 +45,10 @@ extern "C" { * usually more strict because you're not really supposed to dump/load and * upgrade at the same time. */ -#define REV_LEVEL 804 /* This version */ +#define REV_LEVEL 805 /* This version */ #define REV_MIN 591 /* Oldest compatible database */ #define EXPORT_REV_MIN 760 /* Oldest compatible export files */ -#define LIBCITADEL_MIN 804 /* Minimum required version of libcitadel */ +#define LIBCITADEL_MIN 805 /* 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 49b7cdf95..737ae73ae 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.04], [http://www.citadel.org/]) +AC_INIT([Citadel], [8.05], [http://www.citadel.org/]) 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 783e87420..6e732b514 100644 --- a/citadel/debian/changelog +++ b/citadel/debian/changelog @@ -1,3 +1,9 @@ +citadel (8.05-1) stable; urgency=low + + * new upstream version + + -- Wilfried Goesgens Thu, 8 Mar 2012 22:00:00 +0001 + citadel (8.03-1) stable; urgency=low * new upstream version diff --git a/libcitadel/README.txt b/libcitadel/README.txt index 167df4b76..b24cb9048 100644 --- a/libcitadel/README.txt +++ b/libcitadel/README.txt @@ -4,7 +4,7 @@ WebCit. It is not intended to be a general-purpose library for widespread use, although there are parts of it that may be useful for that purpose, such as the MIME parser and the vCard data type. -Copyright (c) 1987-2011 by the citadel.org development team. +Copyright (c) 1987-2012 by the citadel.org development team. This program is distributed under the terms of the GNU General Public License, version 3. diff --git a/libcitadel/configure.in b/libcitadel/configure.in index 608f45f06..f5d36c245 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.04, http://uncensored.citadel.org) +AC_INIT(libcitadel, 8.05, http://uncensored.citadel.org) AC_CONFIG_SRCDIR(Makefile.in) AC_CONFIG_AUX_DIR(conftools) diff --git a/libcitadel/debian/changelog b/libcitadel/debian/changelog index 8d15592c2..188eed5cc 100644 --- a/libcitadel/debian/changelog +++ b/libcitadel/debian/changelog @@ -1,3 +1,9 @@ +libcitadel (8.05-1) stable; urgency=low + + * new release + + -- Wilfried Goesgens Thu, 8 Mar 2012 22:00:00 +0001 + libcitadel (8.02-1) stable; urgency=low * new release diff --git a/libcitadel/lib/libcitadel.h b/libcitadel/lib/libcitadel.h index 1717be24b..fdfa616df 100644 --- a/libcitadel/lib/libcitadel.h +++ b/libcitadel/lib/libcitadel.h @@ -18,7 +18,7 @@ #include #include -#define LIBCITADEL_VERSION_NUMBER 804 +#define LIBCITADEL_VERSION_NUMBER 805 /* * Here's a bunch of stupid magic to make the MIME parser portable. diff --git a/webcit/configure.ac b/webcit/configure.ac index 00bd6e0e4..4aca74153 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.04], [http://www.citadel.org/]) +AC_INIT([WebCit], [8.05], [http://www.citadel.org/]) AC_SUBST(PROG_SUBDIRS) diff --git a/webcit/debian/changelog b/webcit/debian/changelog index 0dd6aa641..1212848e1 100644 --- a/webcit/debian/changelog +++ b/webcit/debian/changelog @@ -1,3 +1,9 @@ +webcit (8.06-1) stable; urgency=low + + * new release + + -- Wilfried Goesgens Thu, 8 Mar 2012 22:00:00 +0001 + webcit (8.03-1) stable; urgency=low * new release diff --git a/webcit/webcit.h b/webcit/webcit.h index 4cb99869f..ca1d1d28f 100644 --- a/webcit/webcit.h +++ b/webcit/webcit.h @@ -8,10 +8,6 @@ * 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" @@ -133,9 +129,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 804 /* This version of WebCit */ -#define MINIMUM_CIT_VERSION 804 /* min required Citadel ver */ -#define LIBCITADEL_MIN 804 /* min required libcitadel ver */ +#define CLIENT_VERSION 805 /* This version of WebCit */ +#define MINIMUM_CIT_VERSION 805 /* min required Citadel ver */ +#define LIBCITADEL_MIN 805 /* 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