# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1393027805 -3600
# Node ID d2cf5616525726f9174e263050e390dce6eab351
# Parent  90c7c543e40ed43a9ce112ce4081f8b62020f86f# Parent  68c925854782722c411d0704ddc9cd2a47d6c0a4
Merged changes from upstream.

diff -r 90c7c543e40e -r d2cf56165257 debian/changelog
--- a/debian/changelog	Sat Feb 22 01:09:24 2014 +0100
+++ b/debian/changelog	Sat Feb 22 01:10:05 2014 +0100
@@ -1,5 +1,56 @@
+kolab (3.1.0-36) unstable; urgency=low
+
+  * Start kolab-saslauthd with the correct permissions
+
+ -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Fri, 14 Feb 2014 12:56:00 +0100
+
+kolab (3.1.0-34.4) unstable; urgency=low
+
+  * Ship new configuration for kolab3 schema
+  * kolab-ucs depends on univention-legacy-kolab-schema no longer, instead Pre-Depends on
+    kolab-schema
+  * Add univention-kolab3-wrapper schema
+  * Revert back to using univention's special internal post user
+
+ -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Wed, 12 Feb 2014 12:56:00 +0100
+
+kolab (3.1.0-34) unstable; urgency=low
+
+  * Silence some of the repetitive actions
+
+ -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Mon, 10 Feb 2014 12:56:00 +0100
+
+kolab (3.1.0-33) unstable; urgency=low
+
+  * Fix a syntax error in the configuration file template for kolab_files.inc.php
+
+ -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Fri, 24 Jan 2014 12:56:00 +0100
+
+kolab (3.1.0-32) unstable; urgency=low
+
+  * Add setting mail/kolab/https to synchronize http/https settings between various
+    components, including Roundcube <-> kolab_files <-> Chwala
+
+ -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Thu, 23 Jan 2014 12:56:00 +0100
+
+kolab (3.1.0-31) unstable; urgency=low
+
+  * Add settings to control the mime format and debug level
+  * Fix ssl verification settings
+  * Correct socket to LMTP path
+
+ -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Thu, 16 Jan 2014 12:56:00 +0100
+
+kolab (3.1.0-28) unstable; urgency=low
+
+  * kolab-ucs really requires univention-legacy-kolab-schema to be installed 
+
+ -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Mon, 13 Jan 2014 12:56:00 +0100
+
 kolab (3.1.0-25) unstable; urgency=low
 
+  * Update roundcube settings
+  * Remove INBOX/ prefix from autocreate_folders
   * Recover some lost changes
   * Correct creation of univention-directory-listener hook link
   * Correct permissions on /etc/kolab/kolab.conf and /var/lib/kolab for UCS
diff -r 90c7c543e40e -r d2cf56165257 debian/control
--- a/debian/control	Sat Feb 22 01:09:24 2014 +0100
+++ b/debian/control	Sat Feb 22 01:10:05 2014 +0100
@@ -98,6 +98,7 @@
 
 Package: kolab-ucs
 Architecture: all
+Pre-Depends: kolab-schema
 Depends:    ${misc:Depends}
 Description: Additional UCS routines for integration
  This package installs the necessary scripts to integrate
diff -r 90c7c543e40e -r d2cf56165257 debian/rules
--- a/debian/rules	Sat Feb 22 01:09:24 2014 +0100
+++ b/debian/rules	Sat Feb 22 01:10:05 2014 +0100
@@ -45,10 +45,10 @@
 		cp -av $(CURDIR)/ucs/debian/kolab-webclient.install $(CURDIR)/debian/kolab-webclient.install ; \
 		cp -av $(CURDIR)/ucs/debian/kolab-webclient.postinst $(CURDIR)/debian/kolab-webclient.postinst ; \
 		for pkg in kolab kolab-imap kolab-mta kolab-webclient; do \
-			echo "ucs:Depends=kolab-ucs" >> $(CURDIR)/debian/$${pkg}.substvars ; \
+			echo "ucs:Depends=kolab-ucs,roundcubemail-skin-kolab" >> $(CURDIR)/debian/$${pkg}.substvars ; \
 		done ; \
 		echo "ucs:Depends=kolab-ucs" >> $(CURDIR)/debian/kolab-ldap.substvars ; \
-		echo "ucs:Pre-Depends=univention-legacy-kolab-schema" >> $(CURDIR)/debian/kolab-ldap.substvars ; \
+		echo "ucs:Pre-Depends=kolab-schema" >> $(CURDIR)/debian/kolab-ldap.substvars ; \
 		echo "ucs:Conflicts=univention-mail-postfix,univention-mail-postfix-forward,univention-mail-postfix-kolab2" >> $(CURDIR)/debian/kolab-mta.substvars ; \
 		echo "ucs:Provides=univention-mail-postfix,univention-mail-postfix-forward,univention-mail-postfix-kolab2" >> $(CURDIR)/debian/kolab-mta.substvars ; \
 		echo "ucs:Replaces=univention-mail-postfix,univention-mail-postfix-forward,univention-mail-postfix-kolab2" >> $(CURDIR)/debian/kolab-mta.substvars ; \