From 41746d2f898e3a111e49d59ff3dfcd9d7e575994 Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Fri, 29 Dec 2017 16:48:01 -0500 Subject: [PATCH] version 915 specifies libical2 for debian dependencies --- citadel/debian/changelog | 6 ++++++ citadel/debian/control | 16 ++++++++-------- citadel/utils/setup.c | 4 ++-- webcit/configure.ac | 2 +- webcit/debian/changelog | 6 ++++++ webcit/debian/control | 2 +- webcit/webcit.h | 2 +- 7 files changed, 25 insertions(+), 13 deletions(-) diff --git a/citadel/debian/changelog b/citadel/debian/changelog index eb42548bf..f85a97003 100644 --- a/citadel/debian/changelog +++ b/citadel/debian/changelog @@ -1,3 +1,9 @@ +citadel (9.15-1) stable; urgency=low + + * new release + + -- Wilfried Goesgens Wed, 29 Dec 2017 12:56:30 -0400 + citadel (9.14-1) stable; urgency=low * new release diff --git a/citadel/debian/control b/citadel/debian/control index 12ff8bb48..2d14a6807 100644 --- a/citadel/debian/control +++ b/citadel/debian/control @@ -3,9 +3,9 @@ Section: mail Priority: extra Maintainer: Wilfried Goesgens Build-Depends: debhelper (>= 4), po-debconf, bison, autotools-dev, - libdb-dev, libical-dev (>=0.43), libldap2-dev, gettext, locales, + libdb-dev, libical2-dev, libldap2-dev, gettext, locales, libpam0g-dev, libsieve2-dev, libssl-dev, libexpat1-dev, libcitadel-dev (> 8.13), - libcurl4-openssl-dev | libcurl3-openssl-dev, zlib1g-dev, libev-dev (>= 4.0), libc-ares-dev (>= 1.7.2) + libcurl4-openssl-dev | libcurl3-openssl-dev, zlib1g-dev, Standards-Version: 3.8.0 Package: citadel-server @@ -20,10 +20,10 @@ Description: complete and feature-rich groupware server * Email, calendaring/scheduling, address books * Bulletin boards, mailing list server, instant messaging * Multiple domain support - * An intuitive, attractive AJAX-style web interface + * An intuitive, attractive dynamic web interface . The Citadel system is extremely versatile. It provides numerous front ends to - present to users, such as a text-based interface, an AJAX-style web interface, + present to users, such as a text-based interface, a dynamic web interface, and many popular PIM clients using SMTP/POP/IMAP. All of these can be used simultaneously. . @@ -39,10 +39,10 @@ Description: complete and feature-rich groupware server; metapackage for full in * Email, calendaring/scheduling, address books * Bulletin boards, mailing list server, instant messaging * Multiple domain support - * An intuitive, attractive AJAX-style web interface + * An intuitive, attractive dynamic web interface . The Citadel system is extremely versatile. It provides numerous front ends to - present to users, such as a text-based interface, an AJAX-style web interface, + present to users, such as a text-based interface, a dynamic web interface, and many popular PIM clients using SMTP/POP/IMAP. All of these can be used simultaneously. . @@ -58,7 +58,7 @@ Description: complete and feature-rich groupware server * Email, calendaring/scheduling, address books * Bulletin boards, mailing list server, instant messaging * Multiple domain support - * An intuitive, attractive AJAX-style web interface + * An intuitive, attractive dynamic web interface . This package contains the common files. @@ -96,6 +96,6 @@ Description: complete and feature-rich groupware server - debugging symbols * Email, calendaring/scheduling, address books * Bulletin boards, mailing list server, instant messaging * Multiple domain support - * An intuitive, attractive AJAX-style web interface + * An intuitive, attractive dynamic web interface . This package provides the debugging symbols for the Citadel server. diff --git a/citadel/utils/setup.c b/citadel/utils/setup.c index e95b30167..c66bd8dde 100644 --- a/citadel/utils/setup.c +++ b/citadel/utils/setup.c @@ -192,8 +192,8 @@ void SetTitles(void) "\n" " 0. Self contained authentication\n" " 1. Host system integrated authentication\n" -" 2. External LDAP - RFC 2307 compliant directory\n" -" 3. External LDAP - nonstandard MS Active Directory\n" +" 2. External LDAP - RFC 2307 POSIX schema\n" +" 3. External LDAP - MS Active Directory schema\n" "\n" "For help: http://www.citadel.org/doku.php/faq:installation:authmodes\n" "\n" diff --git a/webcit/configure.ac b/webcit/configure.ac index 4d6c981ba..0774acf3a 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], [914], [http://www.citadel.org/]) +AC_INIT([WebCit], [915], [http://www.citadel.org/]) AC_SUBST(PROG_SUBDIRS) diff --git a/webcit/debian/changelog b/webcit/debian/changelog index cc75463b4..05af7b990 100644 --- a/webcit/debian/changelog +++ b/webcit/debian/changelog @@ -1,3 +1,9 @@ +webcit (9.15-1) stable; urgency=low + + * new release + + -- Wilfried Goesgens Wed, 29 Dec 2017 12:56:30 -0400 + webcit (9.14-1) stable; urgency=low * new release diff --git a/webcit/debian/control b/webcit/debian/control index e5cf4ed4e..67e12ad0f 100644 --- a/webcit/debian/control +++ b/webcit/debian/control @@ -2,7 +2,7 @@ Source: webcit Section: web Priority: extra Maintainer: Wilfried Goesgens -Build-Depends: debhelper (>= 4), po-debconf, libical-dev (>=0.43), gettext, locales, +Build-Depends: debhelper (>= 4), po-debconf, libical2-dev (>=0.43), gettext, locales, libcitadel-dev (> 8.13), quilt (>= 0.40), autotools-dev, libssl-dev, libmarkdown2-dev Standards-Version: 3.8.0 diff --git a/webcit/webcit.h b/webcit/webcit.h index 54410d05b..7968ac510 100644 --- a/webcit/webcit.h +++ b/webcit/webcit.h @@ -127,7 +127,7 @@ 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 914 /* This version of WebCit */ +#define CLIENT_VERSION 915 /* This version of WebCit */ #define MINIMUM_CIT_VERSION 914 /* Minimum required version of Citadel server */ #define LIBCITADEL_MIN 914 /* Minimum required version of libcitadel */ #define DEFAULT_HOST "localhost" /* Default Citadel server */ -- 2.30.2