diff -Nru kolab-resource-handlers-0.3.9-20060811/debian/changelog kolab-resource-handlers-0.3.9-20060811/debian/changelog
--- kolab-resource-handlers-0.3.9-20060811/debian/changelog	2007-05-30 13:27:40.000000000 +0200
+++ kolab-resource-handlers-0.3.9-20060811/debian/changelog	2007-05-30 13:27:47.000000000 +0200
@@ -1,3 +1,12 @@
+kolab-resource-handlers (0.3.9-20060811-4ubuntu1) gutsy; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - Depends on PHP 5 packages
+    - Update maintainer field in debian/changelog
+  * Use php5 in debian/postint (LP: #107343)
+
+ -- Luca Falavigna <dktrkranz@ubuntu.com>  Tue, 29 May 2007 22:33:09 +0100
+
 kolab-resource-handlers (0.3.9-20060811-4) unstable; urgency=low
 
   [ Peter Eisentraut ]
@@ -11,6 +20,13 @@
 
  -- Peter Eisentraut <petere@debian.org>  Tue, 29 May 2007 14:31:49 +0200
 
+kolab-resource-handlers (0.3.9-20060811-3ubuntu1) feisty; urgency=low
+
+  * Depends on PHP 5 packages (LP: 96389)
+  * Update maintainer field in debian/changelog
+
+ -- Luca Falavigna <dktrkranz@ubuntu.com>  Sat, 14 Apr 2007 11:53:44 +0200
+
 kolab-resource-handlers (0.3.9-20060811-3) unstable; urgency=medium
 
   [ Peter Eisentraut ]
diff -Nru kolab-resource-handlers-0.3.9-20060811/debian/control kolab-resource-handlers-0.3.9-20060811/debian/control
--- kolab-resource-handlers-0.3.9-20060811/debian/control	2007-05-30 13:27:40.000000000 +0200
+++ kolab-resource-handlers-0.3.9-20060811/debian/control	2007-05-30 13:27:47.000000000 +0200
@@ -1,7 +1,8 @@
 Source: kolab-resource-handlers
 Section: misc
 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-resource-handlers
 Architecture: all
-Depends: php-pear, php-net-smtp, php-net-socket, horde3, php-mail-mime, php-net-imap, libapache2-mod-php4, php4-ldap, php4-domxml, ssl-cert, php4-cli
+Depends: php-pear, php-net-smtp, php-net-socket, horde3, php-mail-mime, php-net-imap, libapache2-mod-php5, php5-ldap, ssl-cert, php5-cli
 Description: Kolab free/busy scripts
  This package contains scripts for the free/busy feature of the Kolab
  groupware server.
diff -Nru kolab-resource-handlers-0.3.9-20060811/debian/postinst kolab-resource-handlers-0.3.9-20060811/debian/postinst
--- kolab-resource-handlers-0.3.9-20060811/debian/postinst	2007-05-30 13:27:40.000000000 +0200
+++ kolab-resource-handlers-0.3.9-20060811/debian/postinst	2007-05-30 13:27:47.000000000 +0200
@@ -19,7 +19,7 @@
 }
 
 configure_apache() {
-	for mod in rewrite ssl php4 ldap; do
+	for mod in rewrite ssl php5 ldap; do
 		a2enmod $mod >/dev/null
 	done