diff -u glibc-2.4/debian/debhelper.in/libnss-files-udeb.install glibc-2.4/debian/debhelper.in/libnss-files-udeb.install
--- glibc-2.4/debian/debhelper.in/libnss-files-udeb.install
+++ glibc-2.4/debian/debhelper.in/libnss-files-udeb.install
@@ -1,3 +1,3 @@
 # FIXME: someday we may need to handle installing into non-lib.
-debian/tmp-udeb/lib/libnss_files*.so* lib
+debian/tmp-libc/lib/libnss_files*.so* lib
 
diff -u glibc-2.4/debian/debhelper.in/libnss-dns-udeb.install glibc-2.4/debian/debhelper.in/libnss-dns-udeb.install
--- glibc-2.4/debian/debhelper.in/libnss-dns-udeb.install
+++ glibc-2.4/debian/debhelper.in/libnss-dns-udeb.install
@@ -1,3 +1,3 @@
 # FIXME: someday we may need to handle installing into non-lib.
-debian/tmp-udeb/lib/libnss_dns*.so* lib
+debian/tmp-libc/lib/libnss_dns*.so* lib
 
diff -u glibc-2.4/debian/debhelper.in/libc.postinst glibc-2.4/debian/debhelper.in/libc.postinst
--- glibc-2.4/debian/debhelper.in/libc.postinst
+++ glibc-2.4/debian/debhelper.in/libc.postinst
@@ -359,6 +359,9 @@
 #     else
 #	/etc/init.d/glibc.sh 2>/dev/null || true
 #     fi
+
+    # Create/update iconv module cache.
+    iconvconfig
 fi
 
 if [ "`uname -s`" = Linux ]; then
diff -u glibc-2.4/debian/changelog glibc-2.4/debian/changelog
--- glibc-2.4/debian/changelog
+++ glibc-2.4/debian/changelog
@@ -1,3 +1,16 @@
+glibc (2.4-1ubuntu7) edgy; urgency=low
+
+  * debian/debhelper.in/libnss-dns-udeb.install,
+    debian/debhelper.in/libnss-files-udeb.install: Fix installation of files
+    into libnss-*-udeb.
+
+  * debian/debhelper.in/libc.postinst, debian/debhelper.in/libc.prerm: Run
+    iconvconfig at configure time to create
+    /usr/lib/gconv/gconv-modules.cache; remove this cache in the prerm
+    (closes: Malone #51884).
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Thu, 13 Jul 2006 18:27:40 +0100
+
 glibc (2.4-1ubuntu6) edgy; urgency=low
 
   * debian/patches/series: Filter out belocs-locales-bin merge.
only in patch2:
unchanged:
--- glibc-2.4.orig/debian/debhelper.in/libc.prerm
+++ glibc-2.4/debian/debhelper.in/libc.prerm
@@ -0,0 +1,8 @@
+#! /bin/sh
+set -e
+
+rm -f /usr/lib/gconv/gconv-modules.cache
+
+#DEBHELPER#
+
+exit 0