# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1394747077 -3600
# Node ID 21f427f484ae96549b4a42f6241a25cf6d6fd251
# Parent  8bcad39a6a7bc48d6725cf9756d05e9871516c5f# Parent  05969d6949a72cd9c402badad87cc9527eb36915
Merged upstream changes.

diff -r 8bcad39a6a7b -r 21f427f484ae debian/changelog
--- a/debian/changelog	Sun Mar 09 00:26:50 2014 +0100
+++ b/debian/changelog	Thu Mar 13 22:44:37 2014 +0100
@@ -1,3 +1,22 @@
+kolab (3.1.2-1) unstable; urgency=low
+
+  * Adjust kolab.pref and ensure $HOME is set for webclient join script
+  * Also ensure $USER is set, and export both $USER and $HOME
+
+ -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Fri,  7 Mar 2014 12:56:00 +0100
+
+kolab (3.1.0-38) unstable; urgency=low
+
+  * Drop kolab.list from apt sources
+
+ -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Thu,  6 Mar 2014 12:56:00 +0100
+
+kolab (3.1.0-37) unstable; urgency=low
+
+  * Set USER and GROUP for the init.d script's chmod/chown routine on log directories and files
+
+ -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Wed,  5 Mar 2014 12:56:00 +0100
+
 kolab (3.1.0-36) unstable; urgency=low
 
   * Start kolab-saslauthd with the correct permissions