r1876 - in glibc-package: branches/glibc-2.5/debian branches/glibc-2.5/debian/debhelper.in trunk/debian trunk/debian/debhelper.in
Author: aurel32
Date: 2006-11-04 23:18:54 +0100 (Sat, 04 Nov 2006)
New Revision: 1876
Modified:
glibc-package/branches/glibc-2.5/debian/changelog
glibc-package/branches/glibc-2.5/debian/debhelper.in/locales-all.prerm
glibc-package/branches/glibc-2.5/debian/debhelper.in/locales.postinst
glibc-package/branches/glibc-2.5/debian/debhelper.in/locales.prerm
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/debhelper.in/locales-all.prerm
glibc-package/trunk/debian/debhelper.in/locales.postinst
glibc-package/trunk/debian/debhelper.in/locales.prerm
Log:
* debhelper.in/locales.prerm; debhelper.in/locales.prerm,
debhelper.in/locales-all.prerm: fixed bad interactions between locales
and locales-all. Closes: #396354.
Modified: glibc-package/branches/glibc-2.5/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.5/debian/changelog 2006-11-04 18:10:22 UTC (rev 1875)
+++ glibc-package/branches/glibc-2.5/debian/changelog 2006-11-04 22:18:54 UTC (rev 1876)
@@ -235,6 +235,9 @@
* any/local-iconv-fix-trampoline.diff: new patch (fix iconvconfig segfault
when run under exec-shield, PaX or similar) from hlfs. Closes: #397020.
* debian/po/ro.po: new file, thanks to Stan Ioan-Eugen. Closes: #395348.
+ * debhelper.in/locales.prerm; debhelper.in/locales.prerm,
+ debhelper.in/locales-all.prerm: fixed bad interactions between locales
+ and locales-all. Closes: #396354.
-- Aurelien Jarno <aurel32@debian.org> Sat, 4 Nov 2006 19:00:35 +0100
Modified: glibc-package/branches/glibc-2.5/debian/debhelper.in/locales-all.prerm
===================================================================
--- glibc-package/branches/glibc-2.5/debian/debhelper.in/locales-all.prerm 2006-11-04 18:10:22 UTC (rev 1875)
+++ glibc-package/branches/glibc-2.5/debian/debhelper.in/locales-all.prerm 2006-11-04 22:18:54 UTC (rev 1876)
@@ -3,7 +3,14 @@
case "$1" in
remove|purge)
- rm -f /usr/lib/locale/locale-archive
+ # Is locales installed?
+ if [ -x /usr/sbin/locale-gen ] ; then
+ # If yes, generate locales selected in the debconf question
+ /usr/sbin/locale-gen
+ else
+ # If not, clean the locales
+ rm -f /usr/lib/locale/locale-archive
+ fi
;;
*)
;;
Modified: glibc-package/branches/glibc-2.5/debian/debhelper.in/locales.postinst
===================================================================
--- glibc-package/branches/glibc-2.5/debian/debhelper.in/locales.postinst 2006-11-04 18:10:22 UTC (rev 1875)
+++ glibc-package/branches/glibc-2.5/debian/debhelper.in/locales.postinst 2006-11-04 22:18:54 UTC (rev 1876)
@@ -60,8 +60,12 @@
mv -f $LG.tmp $LG
fi
fi
- # Update requested locales.
- /usr/sbin/locale-gen
+ # Update requested locales if locales-all is not installed
+ if [ -f /usr/lib/locales-all/supported.tar.gz ] ; then
+ echo "locales-all installed, skipping locales generation"
+ else
+ /usr/sbin/locale-gen
+ fi
# Set default LANG environment variable
if [ -e $EE ]; then
Modified: glibc-package/branches/glibc-2.5/debian/debhelper.in/locales.prerm
===================================================================
--- glibc-package/branches/glibc-2.5/debian/debhelper.in/locales.prerm 2006-11-04 18:10:22 UTC (rev 1875)
+++ glibc-package/branches/glibc-2.5/debian/debhelper.in/locales.prerm 2006-11-04 22:18:54 UTC (rev 1876)
@@ -3,7 +3,10 @@
case "$1" in
remove|purge)
- rm -f /usr/lib/locale/locale-archive
+ if ! [ -f /usr/lib/locales-all/supported.tar.gz ] ; then
+ # If locales-all is not installed, clean the locales
+ rm -f /usr/lib/locale/locale-archive
+ fi
;;
*)
;;
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2006-11-04 18:10:22 UTC (rev 1875)
+++ glibc-package/trunk/debian/changelog 2006-11-04 22:18:54 UTC (rev 1876)
@@ -3,6 +3,9 @@
* any/local-iconv-fix-trampoline.diff: new patch (fix iconvconfig segfault
when run under exec-shield, PaX or similar) from hlfs. Closes: #397020.
* debian/po/ro.po: new file, thanks to Stan Ioan-Eugen. Closes: #395348.
+ * debhelper.in/locales.prerm; debhelper.in/locales.prerm,
+ debhelper.in/locales-all.prerm: fixed bad interactions between locales
+ and locales-all. Closes: #396354.
-- Aurelien Jarno <aurel32@debian.org> Sat, 4 Nov 2006 19:00:35 +0100
Modified: glibc-package/trunk/debian/debhelper.in/locales-all.prerm
===================================================================
--- glibc-package/trunk/debian/debhelper.in/locales-all.prerm 2006-11-04 18:10:22 UTC (rev 1875)
+++ glibc-package/trunk/debian/debhelper.in/locales-all.prerm 2006-11-04 22:18:54 UTC (rev 1876)
@@ -3,7 +3,14 @@
case "$1" in
remove|purge)
- rm -f /usr/lib/locale/locale-archive
+ # Is locales installed?
+ if [ -x /usr/sbin/locale-gen ] ; then
+ # If yes, generate locales selected in the debconf question
+ /usr/sbin/locale-gen
+ else
+ # If not, clean the locales
+ rm -f /usr/lib/locale/locale-archive
+ fi
;;
*)
;;
Modified: glibc-package/trunk/debian/debhelper.in/locales.postinst
===================================================================
--- glibc-package/trunk/debian/debhelper.in/locales.postinst 2006-11-04 18:10:22 UTC (rev 1875)
+++ glibc-package/trunk/debian/debhelper.in/locales.postinst 2006-11-04 22:18:54 UTC (rev 1876)
@@ -60,8 +60,12 @@
mv -f $LG.tmp $LG
fi
fi
- # Update requested locales.
- /usr/sbin/locale-gen
+ # Update requested locales if locales-all is not installed
+ if [ -f /usr/lib/locales-all/supported.tar.gz ] ; then
+ echo "locales-all installed, skipping locales generation"
+ else
+ /usr/sbin/locale-gen
+ fi
# Set default LANG environment variable
if [ -e $EE ]; then
Modified: glibc-package/trunk/debian/debhelper.in/locales.prerm
===================================================================
--- glibc-package/trunk/debian/debhelper.in/locales.prerm 2006-11-04 18:10:22 UTC (rev 1875)
+++ glibc-package/trunk/debian/debhelper.in/locales.prerm 2006-11-04 22:18:54 UTC (rev 1876)
@@ -3,7 +3,10 @@
case "$1" in
remove|purge)
- rm -f /usr/lib/locale/locale-archive
+ if ! [ -f /usr/lib/locales-all/supported.tar.gz ] ; then
+ # If locales-all is not installed, clean the locales
+ rm -f /usr/lib/locale/locale-archive
+ fi
;;
*)
;;
Reply to: