diff -u libpam-ldap-184/debian/changelog libpam-ldap-184/debian/changelog
--- libpam-ldap-184/debian/changelog
+++ libpam-ldap-184/debian/changelog
@@ -1,3 +1,30 @@
+libpam-ldap (184-8.7ubuntu1) vivid; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - debian/control: add a versioned dependency on ldap-auth-config,
+      to ensure pam-related consistency at all points.
+    - debian/control: removed Build-Depends on po-debconf (debconf handled
+      by ldap-auth-config now)
+    - Removed the following files, due to use of ldap-auth-config:
+      debian/config
+      debian/libpam-ldap.postrm
+      debian/po
+      debian/templates
+    - debian/libpam-ldap.dirs: removed etc
+    - debian/rules: don't use --with-ldap-conf-file and --with-ldap-secret-file
+    - debian/rules: remove binary-post-install/libpam-ldap stanza
+    - updated README.Debian
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 28 Oct 2014 10:41:12 +0100
+
+libpam-ldap (184-8.7) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Do not remove config files when removing the package from one architecture
+    in a multiarch environemnt.  Closes: 706185
+
+ -- Breno Leitao <brenohl@br.ibm.com>  Tue, 22 Jul 2014 14:31:57 +0000
+
 libpam-ldap (184-8.6ubuntu1) utopic; urgency=low
 
   * Merge from Debian unstable.  Remaining changes:
diff -u libpam-ldap-184/debian/libpam-ldap.prerm libpam-ldap-184/debian/libpam-ldap.prerm
--- libpam-ldap-184/debian/libpam-ldap.prerm
+++ libpam-ldap-184/debian/libpam-ldap.prerm
@@ -2,7 +2,8 @@
 
 set -e
 
-if [ "$1" = remove ]; then
+if [ "$1" = remove ] && \
+[ "$(dpkg-query --show libpam-ldap 2> /dev/null | wc -l)" = 1 ]; then
 	pam-auth-update --package --remove ldap
 fi