diff -Nru ldapscripts-2.0.1/debian/changelog ldapscripts-2.0.1/debian/changelog
--- ldapscripts-2.0.1/debian/changelog	2012-01-15 23:22:04.000000000 +0100
+++ ldapscripts-2.0.1/debian/changelog	2012-01-27 22:29:39.000000000 +0100
@@ -1,3 +1,11 @@
+ldapscripts (2.0.1-1ubuntu1) precise; urgency=low
+
+  * Merge from Debian testing (LP: #922834).   Remaining changes:
+    - debian/runtime.debian: replaced /etc/libnss-ldap.conf references by
+      /etc/ldap.conf, many thanks Ahmed El-Mahmoudy.
+
+ -- Leo Iannacone <l3on@ubuntu.com>  Fri, 27 Jan 2012 22:27:22 +0100
+
 ldapscripts (2.0.1-1) unstable; urgency=low
 
   * Imported Upstream version 2.0.1
@@ -8,6 +16,14 @@
 
  -- Alexander GQ Gerasiov <gq@debian.org>  Mon, 16 Jan 2012 02:21:44 +0400
 
+ldapscripts (1.10.0-1ubuntu1) oneiric; urgency=low
+
+  * Merge from debian unstable (LP: #777924).  Remaining changes:
+    - debian/runtime.debian: replaced /etc/libnss-ldap.conf references by
+      /etc/ldap.conf, many thanks Ahmed El-Mahmoudy.
+
+ -- Paolo Sammicheli <xdatap1@ubuntu.com>  Tue, 22 Mar 2011 23:37:44 +0000
+
 ldapscripts (1.10.0-1) unstable; urgency=low
 
   * debian/control: Standards-version updated, no changes needed.
@@ -20,6 +36,14 @@
 
  -- Alexander GQ Gerasiov <gq@debian.org>  Mon, 21 Mar 2011 17:45:15 +0300
 
+ldapscripts (1.9.0-3ubuntu1) natty; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - debian/runtime.debian: replaced /etc/libnss-ldap.conf references by
+      /etc/ldap.conf, many thanks Ahmed El-Mahmoudy.
+
+ -- Lorenzo De Liso <blackz@ubuntu.com>  Mon, 03 Jan 2011 16:29:57 +0100
+
 ldapscripts (1.9.0-3) unstable; urgency=low
 
   * Use pwgen as password generator by default. Closes: #592369.
diff -Nru ldapscripts-2.0.1/debian/control ldapscripts-2.0.1/debian/control
--- ldapscripts-2.0.1/debian/control	2012-01-15 23:20:55.000000000 +0100
+++ ldapscripts-2.0.1/debian/control	2012-01-26 06:04:44.000000000 +0100
@@ -1,7 +1,8 @@
 Source: ldapscripts
 Section: admin
 Priority: optional
-Maintainer: Alexander GQ Gerasiov <gq@debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Alexander GQ Gerasiov <gq@debian.org>
 Homepage: http://ldapscripts.sourceforge.net/
 Standards-Version: 3.9.2
 Build-Depends: cdbs, debhelper (>= 7.0.0)
diff -Nru ldapscripts-2.0.1/debian/runtime.debian ldapscripts-2.0.1/debian/runtime.debian
--- ldapscripts-2.0.1/debian/runtime.debian	2012-01-15 23:18:32.000000000 +0100
+++ ldapscripts-2.0.1/debian/runtime.debian	2012-01-26 06:04:44.000000000 +0100
@@ -23,7 +23,7 @@
 
 getfield() {
     local field="$1"
-    local conffile='/etc/libnss-ldap.conf'
+    local conffile='/etc/ldap.conf'
     if [ -f "$conffile" ];then
 	local value="$(awk "/^[ \t]*$field/ {sub(/^[ \t]*$field[ \t]*/,\"\"); sub(/[ \t]*(#.*)?\$/, \"\"); print \$0}" "$conffile")"
     else