# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1410362408 -7200
# Node ID fcad612e5d05b7b93e87bfc8999f07dce08267a8
# Parent  b01a1de2111cf31fffd7b66aa9cbc7be4f767e21# Parent  473f4b6a2ce8ea05445b02f2c47bc80b222f6197
Merged upstream changes.

diff -r b01a1de2111c -r fcad612e5d05 debian/changelog
--- a/debian/changelog	Thu Mar 06 23:34:27 2014 +0100
+++ b/debian/changelog	Wed Sep 10 17:20:08 2014 +0200
@@ -1,3 +1,39 @@
+kolab-webadmin (3.2.1-0~kolab3) unstable; urgency=low
+
+  * removed debugging
+
+ -- Daniel Hoffend <dh@dotlan.net>  Fri, 29 Aug 2014 22:08:00 +0100
+
+kolab-webadmin (3.2.1-0~kolab2) unstable; urgency=low
+
+  * updated translations
+
+ -- Daniel Hoffend <dh@dotlan.net>  Fri, 29 Aug 2014 22:08:00 +0100
+
+kolab-webadmin (3.2.1-0~kolab1) unstable; urgency=low
+
+  * Release of 3.2.1
+
+ -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Wed, 20 Aug 2014 22:08:00 +0100
+
+kolab-webadmin (3.2.0-0~kolab1) unstable; urgency=low
+
+  * Release of 3.2.0
+
+ -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Thu, 14 Aug 2014 22:08:00 +0100
+
+kolab-webadmin (3.2-0~kolab2) unstable; urgency=low
+
+  * New git snapshot
+
+ -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Tue, 24 Jun 2014 22:08:00 +0100
+
+kolab-webadmin (3.2-0~kolab1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Thu,  3 Apr 2014 22:08:00 +0100
+
 kolab-webadmin (3.1.5-0~kolab1) unstable; urgency=low
 
   * New upstream release
diff -r b01a1de2111c -r fcad612e5d05 debian/control
--- a/debian/control	Thu Mar 06 23:34:27 2014 +0100
+++ b/debian/control	Wed Sep 10 17:20:08 2014 +0200
@@ -12,15 +12,20 @@
 Package: kolab-webadmin
 Architecture: all
 Depends: kolab-conf,
-                apache2,
-		php5,
-		smarty3 (>= 3.1.7),
-		php-net-ldap2,
-		libmozldap-0d,
-		mozldap-tools,
-		libapache2-mod-php5,
-		php5-mysql,
-		${misc:Depends}
+         apache2,
+         libapache2-mod-php5,
+         libmozldap-0d,
+         mozldap-tools,
+         php-http-request2,
+         php-mail,
+         php-net-ldap2,
+         php-net-ldap3,
+         php-net-smtp,
+         php-net-url2,
+         php5,
+         php5-mysql,
+         smarty3 (>= 3.1.7),
+         ${misc:Depends}
 Description: Kolab administration web interface
  This package contains the web GUI for the administration of the Kolab
  groupware server.
diff -r b01a1de2111c -r fcad612e5d05 debian/rules
--- a/debian/rules	Thu Mar 06 23:34:27 2014 +0100
+++ b/debian/rules	Wed Sep 10 17:20:08 2014 +0200
@@ -11,6 +11,7 @@
 	find debian/kolab-webadmin/usr/share/kolab-webadmin/ -type f -name "*.enterprise" -exec rm -v {} \;
 	# Rename the Apache conf file
 	mv debian/kolab-webadmin/etc/kolab-webadmin/kolab-webadmin.conf debian/kolab-webadmin/etc/kolab-webadmin/apache.conf
+	rm -rf debian/kolab-webadmin/usr/share/kolab-webadmin/lib/ext/
 	# Some PHP files seem to be executable
 	find debian/kolab-webadmin/usr/share/kolab-webadmin/lib -type f -name "*php" -perm +1 -print0 | xargs -r0 chmod -x