From: Art Cancro Date: Fri, 11 Nov 2011 22:26:39 +0000 (-0500) Subject: Version number to 8.02 for upcoming release X-Git-Tag: v8.11~390 X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=168342e0ff3187e28faa4be0f17f5a3b7d043e95 Version number to 8.02 for upcoming release --- diff --git a/citadel/citadel.h b/citadel/citadel.h index f3ef0ceb0..03c71a7ea 100644 --- a/citadel/citadel.h +++ b/citadel/citadel.h @@ -1,7 +1,7 @@ /* * 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 @@ -51,10 +51,10 @@ extern "C" { * 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 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 */ diff --git a/citadel/configure.ac b/citadel/configure.ac index dbe59677e..0dd079265 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.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) diff --git a/citadel/debian/changelog b/citadel/debian/changelog index 1edc07d43..bc73b94e0 100644 --- a/citadel/debian/changelog +++ b/citadel/debian/changelog @@ -1,3 +1,9 @@ +citadel (8.02-1) stable; urgency=low + + * new upstream version + + -- Wilfried Goesgens Fri, 11 Nov 2011 22:00:00 +0001 + citadel (7.83-91) stable; urgency=low * new upstream version diff --git a/citadel/ldap.c b/citadel/ldap.c index baa123aeb..cc88a7b4e 100644 --- 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. * - * 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. diff --git a/citadel/parsedate.c b/citadel/parsedate.c index 2df743a77..ef584417f 100644 --- 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. - - 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. diff --git a/libcitadel/configure.in b/libcitadel/configure.in index bc5e49f42..71328a0df 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.01, http://uncensored.citadel.org) +AC_INIT(libcitadel, 8.02, 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 1b9921f88..2c04b1034 100644 --- a/libcitadel/debian/changelog +++ b/libcitadel/debian/changelog @@ -1,9 +1,14 @@ +libcitadel (8.02-1) stable; urgency=low + + * new release + + -- Wilfried Goesgens Fri, 11 Nov 2011 22:00:00 +0001 + libcitadel (7.89-99) stable; urgency=low * pre release -- Wilfried Goesgens Wed, 28 Jul 2010 22:00:00 +0001 - libcitadel (7.83-91) stable; urgency=low * new release diff --git a/libcitadel/lib/libcitadel.h b/libcitadel/lib/libcitadel.h index 4afcbde89..a6ebe150a 100644 --- a/libcitadel/lib/libcitadel.h +++ b/libcitadel/lib/libcitadel.h @@ -16,7 +16,7 @@ #include #include -#define LIBCITADEL_VERSION_NUMBER 801 +#define LIBCITADEL_VERSION_NUMBER 802 /* * Here's a bunch of stupid magic to make the MIME parser portable. diff --git a/webcit/configure.ac b/webcit/configure.ac index 0a0ea941b..5745b98b1 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.00], [http://www.citadel.org/]) +AC_INIT([WebCit], [8.02], [http://www.citadel.org/]) AC_SUBST(PROG_SUBDIRS) diff --git a/webcit/debian/changelog b/webcit/debian/changelog index 51e4b8944..5aec34301 100644 --- a/webcit/debian/changelog +++ b/webcit/debian/changelog @@ -1,3 +1,9 @@ +webcit (8.02-1) stable; urgency=low + + * new release + + -- Wilfried Goesgens Dri, 11 Nov 2011 22:00:00 +0001 + webcit (7.83-91) stable; urgency=low * new release diff --git a/webcit/webcit.h b/webcit/webcit.h index ad5aafc11..0beda739a 100644 --- 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 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 */ @@ -170,31 +170,31 @@ extern char *ssl_cipher_list; * * 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_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_DOWNLOAD 128 /* Allowed to download */ +#define QR_DOWNLOAD 128 /* Allowed to download */ #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_NETWORK 2048 /* Shared network room */ +#define QR_NETWORK 2048 /* Shared network room */ #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 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_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