diff -u phpldapadmin-0.9.8.4/debian/patches/00list phpldapadmin-0.9.8.4/debian/patches/00list
--- phpldapadmin-0.9.8.4/debian/patches/00list
+++ phpldapadmin-0.9.8.4/debian/patches/00list
@@ -2,0 +3 @@
+fix_locales_doc
diff -u phpldapadmin-0.9.8.4/debian/control phpldapadmin-0.9.8.4/debian/control
--- phpldapadmin-0.9.8.4/debian/control
+++ phpldapadmin-0.9.8.4/debian/control
@@ -1,13 +1,14 @@
 Source: phpldapadmin
 Section: admin
 Priority: extra
-Maintainer: Fabio Tranchitella <kobold@debian.org>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Fabio Tranchitella <kobold@debian.org>
 Build-Depends: debhelper (>= 5.0.0), po-debconf, dpatch
-Standards-Version: 3.7.2
+Standards-Version: 3.7.3
 
 Package: phpldapadmin
 Architecture: all
-Depends: apache2 | httpd, php5-ldap | php4-ldap, libapache2-mod-php5 | libapache-mod-php5 | php5-cgi | php5 | libapache2-mod-php4 | libapache-mod-php4 | php4 | php4-cgi, ${misc:Depends}
+Depends: apache2 | httpd, php5-ldap, libapache2-mod-php5 | php5 | php5-cgi, ${misc:Depends}
 Description: web based interface for administering LDAP servers
  phpLDAPadmin is a web-based LDAP client. It provides easy,
  anywhere-accessible, multi-language administration for your LDAP
diff -u phpldapadmin-0.9.8.4/debian/changelog phpldapadmin-0.9.8.4/debian/changelog
--- phpldapadmin-0.9.8.4/debian/changelog
+++ phpldapadmin-0.9.8.4/debian/changelog
@@ -1,9 +1,28 @@
+phpldapadmin (0.9.8.4-2ubuntu1) hardy; urgency=low
+
+  * Merge from Debian unstable (LP: #175701). Remaining Ubuntu changes:
+    - debian/control: Remove Depends on php4/libapache packages
+  * Fix documentation of language/locale config variable
+    (LP: #118322)
+  * debian/control: Standards-Version 3.7.3
+
+ -- dAniel hAhler <ubuntu@thequod.de>  Tue, 11 Dec 2007 21:46:39 +0100
+
 phpldapadmin (0.9.8.4-2) unstable; urgency=low
 
   * debian/control: fix dependencies on php. (Closes: #444354)
 
  -- Fabio Tranchitella <kobold@debian.org>  Thu, 11 Oct 2007 13:31:51 +0200
 
+phpldapadmin (0.9.8.4-1ubuntu1) gutsy; urgency=low
+
+  * debian/control: Optionally depend on php5-cgi (think lighttpd)
+    (LP: #126746)
+  * debian/control: Remove Depends on php4 packages, because they are not
+    supported in Ubuntu anymore.
+
+ -- dAniel hAhler <ubuntu@thequod.de>  Tue, 11 Sep 2007 01:01:33 +0200
+
 phpldapadmin (0.9.8.4-1) unstable; urgency=low
 
   * New upstream release.
only in patch2:
unchanged:
--- phpldapadmin-0.9.8.4.orig/debian/patches/fix_locales_doc.dpatch
+++ phpldapadmin-0.9.8.4/debian/patches/fix_locales_doc.dpatch
@@ -0,0 +1,22 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## fix_locales.dpatch by dAniel hAhler <ubuntu@thequod.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix documentation of language/locale param, LP: #118322.
+
+@DPATCH@
+diff -urNad phpldapadmin-0.9.8.4~/config/config.php.example phpldapadmin-0.9.8.4/config/config.php.example
+--- phpldapadmin-0.9.8.4~/config/config.php.example	2007-03-18 02:22:57.000000000 +0100
++++ phpldapadmin-0.9.8.4/config/config.php.example	2007-12-11 21:40:00.437654016 +0100
+@@ -49,8 +49,9 @@
+ $config->custom->session['blowfish'] = '';
+ 
+ /* The language setting. If you set this to 'auto', phpLDAPadmin will attempt
+-   to determine your language automatically. Otherwise, available lanaguages
+-   are: 'ct', 'de', 'en', 'es', 'fr', 'it', 'nl', and 'ru'
++   to determine your language automatically. Otherwise, available languages
++   are: 'ca_ES', 'cs_CZ', 'de_DE', 'es_ES', 'fr_FR', 'hu_HU', 'it_IT',
++   'ja_JP', 'nl_BE', 'pl_PL', 'pt_BR', 'ru_RU', 'sv_FI', 'zh_CN' and 'zh_TW'.
+    Localization is not complete yet, but most strings have been translated.
+    Please help by writing language files. See lang/en.php for an example. */
+ // $config->custom->appearance['language'] = 'auto';