Merge lp:~vorlon/ubuntu/precise/eglibc/obsolete-conffile into lp:ubuntu/precise/eglibc

[Steve Langasek]

Adam, can you double-check that this looks sane to you for handling conffile
removal on upgrades? We don't want to leave stale conffiles on the system,
but we also don't want to do anything here that might break the upgrade.

=== modified file 'debian/changelog'
--- debian/changelog	2012-03-24 08:51:13 +0000
+++ debian/changelog	2012-04-09 18:16:19 +0000
@@ -12,6 +12,10 @@
     depending on the no-longer-existent /lib/init/readlink.
   * Drop obsolete gdm upgrade handling code that only applies for upgrades
     from hardy to lucid.
+  * Remove the /etc/ld.so.conf.d/i486-linux-gnu.conf conffile on upgrade on
+    i386, since it's no longer shipped and we should give consistent results
+    on upgrade and install; and add a Breaks on the three library packages
+    in lucid that used this path.
 
  -- Steve Langasek <[e-mail]>  Sat, 24 Mar 2012 00:47:58 -0700
 
 
=== modified file 'debian/control.in/libc'
--- debian/control.in/libc	2012-01-11 15:01:07 +0000
+++ debian/control.in/libc	2012-04-09 18:16:19 +0000
@@ -16,7 +16,7 @@
           libc6-ppc64 [ppc64],
           libc6-s390x [s390x],
           libc6-sparc64 [sparc64]
-Breaks: nscd (<< 2.15)
+Breaks: nscd (<< 2.15), liblouis0 (<< 2.3.0-2) [i386], liblouisxml1 (<< 2.4.0-2) [i386], libhwloc0 [i386]
 Description: Embedded GNU C Library: Shared libraries
  Contains the standard libraries that are used by nearly all programs on
  the system. This package includes shared versions of the standard C library
 
=== modified file 'debian/debhelper.in/libc.preinst'
--- debian/debhelper.in/libc.preinst	2012-03-25 19:05:21 +0000
+++ debian/debhelper.in/libc.preinst	2012-04-09 18:16:19 +0000
@@ -150,6 +150,9 @@
         rm_conffile LIBC "/etc/init.d/glibc.sh"
 	update-rc.d glibc.sh remove >/dev/null
     fi
+    if dpkg --compare-versions "$preversion" lt "2.15-0ubuntu7"; then
+        rm_conffile LIBC "/etc/ld.so.conf.d/i486-linux-gnu.conf"
+    fi
 
     # Load debconf module if available
     if [ -f /usr/share/debconf/confmodule ] ; then