Author: aurel32
Date: 2008-01-12 14:33:58 +0000 (Sat, 12 Jan 2008)
New Revision: 2780
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/debhelper.in/locales.postinst
Log:
* debian/debhelper.in/locales.postinst: don't update /etc/default/locale
if it already exists and DEBCONF_RECONFIGURE is not empty. Closes:
#458914.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2008-01-12 14:22:47 UTC (rev
2779)
+++ glibc-package/trunk/debian/changelog 2008-01-12 14:33:58 UTC (rev
2780)
@@ -23,6 +23,9 @@
much programs. Closes: #459643.
* patches/localedata/locale-pt_PT.diff: new patch from Flávio Martins to
fix mon_decimal_point for pt_PT. Closes: #459217.
+ * debian/debhelper.in/locales.postinst: don't update /etc/default/locale
+ if it already exists and DEBCONF_RECONFIGURE is not empty. Closes:
+ #458914.
[ Clint Adams ]
* debhelper.in/nscd.init: use lsb output functions. Closes: #457661.
@@ -33,7 +36,7 @@
* patches/hurd-i386/submitted-extern_inline.diff new patch to fix extern
inline declarations for c++.
- -- Aurelien Jarno <[EMAIL PROTECTED]> Sat, 12 Jan 2008 15:21:38 +0100
+ -- Aurelien Jarno <[EMAIL PROTECTED]> Sat, 12 Jan 2008 15:33:10 +0100
glibc (2.7-5) unstable; urgency=low
Modified: glibc-package/trunk/debian/debhelper.in/locales.postinst
===================================================================
--- glibc-package/trunk/debian/debhelper.in/locales.postinst 2008-01-12
14:22:47 UTC (rev 2779)
+++ glibc-package/trunk/debian/debhelper.in/locales.postinst 2008-01-12
14:33:58 UTC (rev 2780)
@@ -54,14 +54,16 @@
/usr/sbin/locale-gen
fi
- # Set default LANG environment variable
- if [ -e $EE ]; then
- # Remove previous definitions
- /usr/sbin/update-locale --no-checks LANG
+ if ! [ -e $EE] || [ -n "$DEBCONF_RECONFIGURE" ] ; then
+ # Set default LANG environment variable
+ if [ -e $EE ]; then
+ # Remove previous definitions
+ /usr/sbin/update-locale --no-checks LANG
+ fi
+ if [ -n "$DEFAULT_ENVIRONMENT" ] && [ "$DEFAULT_ENVIRONMENT" != "None"
]; then
+ /usr/sbin/update-locale "LANG=$DEFAULT_ENVIRONMENT"
+ fi
fi
- if [ -n "$DEFAULT_ENVIRONMENT" ] && [ "$DEFAULT_ENVIRONMENT" != "None" ];
then
- /usr/sbin/update-locale "LANG=$DEFAULT_ENVIRONMENT"
- fi
fi
#DEBHELPER#
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
