Author: barbier
Date: 2006-07-05 21:14:26 +0000 (Wed, 05 Jul 2006)
New Revision: 1674
Modified:
glibc-package/branches/glibc-2.4/debian/changelog
glibc-package/branches/glibc-2.4/debian/debhelper.in/libc.postinst
glibc-package/branches/glibc-2.4/debian/debhelper.in/libc.postrm
Log:
Merge r1673 from trunk:
* debian/debhelper.in/libc.postinst: Call iconvconfig to generate
/usr/lib/gconv/gconv-modules.cache. (Closes: #376811)
* debian/debhelper.in/libc.postrm: Remove this cache file.
Modified: glibc-package/branches/glibc-2.4/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.4/debian/changelog 2006-07-05 21:10:40 UTC
(rev 1673)
+++ glibc-package/branches/glibc-2.4/debian/changelog 2006-07-05 21:14:26 UTC
(rev 1674)
@@ -173,6 +173,9 @@
(Closes: #374365)
* Update Brazilian Portuguese debconf translation, by Felipe Augusto
van de Wiel. (Closes: #375451)
+ * debian/debhelper.in/libc.postinst: Call iconvconfig to generate
+ /usr/lib/gconv/gconv-modules.cache. (Closes: #376811)
+ * debian/debhelper.in/libc.postrm: Remove this cache file.
-- Aurelien Jarno <[EMAIL PROTECTED]> Thu, 8 Jun 2006 08:03:49 +0200
Modified: glibc-package/branches/glibc-2.4/debian/debhelper.in/libc.postinst
===================================================================
--- glibc-package/branches/glibc-2.4/debian/debhelper.in/libc.postinst
2006-07-05 21:10:40 UTC (rev 1673)
+++ glibc-package/branches/glibc-2.4/debian/debhelper.in/libc.postinst
2006-07-05 21:14:26 UTC (rev 1674)
@@ -349,6 +349,9 @@
fi # end upgrading and $preversion lt 2.3.5-1
fi # Upgrading
+ # Generate cache file /usr/lib/gconv/gconv-modules.cache
+ iconvconfig || true
+
# # DO NOT FOLLOW THIS EXAMPLE IN OTHER PACKAGES
updatercd glibc.sh start 01 S .
if [ -x /usr/sbin/invoke-rc.d ]; then
Modified: glibc-package/branches/glibc-2.4/debian/debhelper.in/libc.postrm
===================================================================
--- glibc-package/branches/glibc-2.4/debian/debhelper.in/libc.postrm
2006-07-05 21:10:40 UTC (rev 1673)
+++ glibc-package/branches/glibc-2.4/debian/debhelper.in/libc.postrm
2006-07-05 21:14:26 UTC (rev 1674)
@@ -9,6 +9,8 @@
suidunregister -s LIBC /usr/libexec/pt_chown
fi
fi
+ # Created in the postinst by iconvconfig
+ rm -f /usr/lib/gconv/gconv-modules.cache || true
fi
if [ "$1" = upgrade ]; then
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
