diff -u kolab-webadmin-0.4.0-20060810/debian/changelog kolab-webadmin-0.4.0-20060810/debian/changelog
--- kolab-webadmin-0.4.0-20060810/debian/changelog
+++ kolab-webadmin-0.4.0-20060810/debian/changelog
@@ -1,3 +1,11 @@
+kolab-webadmin (0.4.0-20060810-5ubuntu1) gutsy; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - Depends on php5
+    - Update maintainer field in debian/control
+
+ -- Luca Falavigna <dktrkranz@ubuntu.com>  Tue, 29 May 2007 22:33:15 +0100
+
 kolab-webadmin (0.4.0-20060810-5) unstable; urgency=low
 
   * Changed 40-kolab_prefix.dpatch to patch config.php.in instead of
@@ -6,6 +14,14 @@
 
  -- Peter Eisentraut <petere@debian.org>  Tue, 29 May 2007 14:18:23 +0200
 
+kolab-webadmin (0.4.0-20060810-4ubuntu1) gutsy; urgency=low
+
+  * Merge from Debian unstable. Remaining Ubuntu changes:
+    - Depends on php5
+    - Update maintainer field in debian/control
+
+ -- Luca Falavigna <dktrkranz@ubuntu.com>  Tue,  1 May 2007 12:05:58 +0200
+
 kolab-webadmin (0.4.0-20060810-4) unstable; urgency=medium
 
   * Install the apache.conf file into the kolab directory to make sure
@@ -16,6 +32,13 @@
 
  -- Steffen Joeris <white@debian.org>  Wed,  3 Jan 2007 13:02:25 +0100
 
+kolab-webadmin (0.4.0-20060810-3ubuntu1) feisty; urgency=low
+
+  * Depends on php5 (LP: 96315)
+  * Update maintainer field in debian/control
+
+ -- Luca Falavigna <dktrkranz@ubuntu.com>  Thu, 12 Apr 2007 22:39:57 +0200
+
 kolab-webadmin (0.4.0-20060810-3) unstable; urgency=medium
 
   * Added DirectoryIndex index.php
diff -u kolab-webadmin-0.4.0-20060810/debian/control kolab-webadmin-0.4.0-20060810/debian/control
--- kolab-webadmin-0.4.0-20060810/debian/control
+++ kolab-webadmin-0.4.0-20060810/debian/control
@@ -1,7 +1,8 @@
 Source: kolab-webadmin
 Section: admin
 Priority: extra
-Maintainer: Debian Kolab Maintainers <pkg-kolab-devel@lists.alioth.debian.org>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian Kolab Maintainers <pkg-kolab-devel@lists.alioth.debian.org>
 Uploaders: Noèl Köthe <noel@debian.org>, Steffen Joeris <white@debian.org>, Peter Eisentraut <petere@debian.org>
 Build-Depends: debhelper (>= 4), dpatch
 Standards-Version: 3.7.2
@@ -10,7 +11,7 @@
 
 Package: kolab-webadmin
 Architecture: all
-Depends: php4, smarty, php-net-sieve
+Depends: php5, smarty, php-net-sieve
 Description: Kolab administration web interface
  This package contains the web GUI for the administration of the Kolab
  groupware server.
only in patch2:
unchanged: