version 915 specifies libical2 for debian dependencies

diff --git a/citadel/debian/changelog b/citadel/debian/changelog
index eb42548bfdfebddfd273cef3df13faec74097d5b..f85a970038671075241c3b32ed8f014f2ee3a21e 100644 (file)
--- a/citadel/debian/changelog
+++ b/citadel/debian/changelog
@@ -1,3 +1,9 @@
+citadel (9.15-1) stable; urgency=low
+
+  * new release
+
+ -- Wilfried Goesgens <w.goesgens@outgesourced.org>  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 12ff8bb4872352fa2a4c487e506b778a6fa3a9be..2d14a6807edc726c7bcef84d038d4d3a3880ccf3 100644 (file)
--- a/citadel/debian/control
+++ b/citadel/debian/control
@@ -3,9 +3,9 @@ Section: mail
 Priority: extra
 Maintainer: Wilfried Goesgens <w.goesgens@outgesourced.org>
 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 e95b30167926d5cb55acc615be57feda832413d3..c66bd8dde3de7bb6bc41875e42ebdbbd06a3efbc 100644 (file)
--- 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 4d6c981ba8c73dbbf3d8824a12dd319eaebe1d7d..0774acf3a95671f456ff9818c9736da631ee853b 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], [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 cc75463b41229632fa4fad9c6b2b292f9b7d94d9..05af7b990fcd68d92913a79415ab43d2ba2b2304 100644 (file)
--- a/webcit/debian/changelog
+++ b/webcit/debian/changelog
@@ -1,3 +1,9 @@
+webcit (9.15-1) stable; urgency=low
+
+  * new release
+
+ -- Wilfried Goesgens <w.goesgens@outgesourced.org>  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 e5cf4ed4e210b1a3a441f653a39c45ed3675bdf6..67e12ad0f440889b94b3e07885dabd32bc7b5f5f 100644 (file)
--- a/webcit/debian/control
+++ b/webcit/debian/control
@@ -2,7 +2,7 @@ Source: webcit
 Section: web
 Priority: extra
 Maintainer: Wilfried Goesgens <w.goesgens@outgesourced.org>
-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 54410d05bd676d5ea45690226a5bda1cd318b4aa..7968ac510d3299547c03fd7a10290f9cc7905cfa 100644 (file)
--- 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 */