r3492 - in glibc-package/trunk/debian: . debhelper.in
Author: aurel32
Date: 2009-05-11 12:48:23 +0000 (Mon, 11 May 2009)
New Revision: 3492
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/debhelper.in/locales.config
Log:
* debhelper.in/locales.config: use previous debconf settings if
/etc/environment and /etc/default/locale do not exist.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2009-05-11 08:56:57 UTC (rev 3491)
+++ glibc-package/trunk/debian/changelog 2009-05-11 12:48:23 UTC (rev 3492)
@@ -6,6 +6,8 @@
#527945.
* debian/patches/localedata/supported.diff: add kk_KZ.RK1048 locale.
Closes: #528177.
+ * debhelper.in/locales.config: use previous debconf settings if
+ /etc/environment and /etc/default/locale do not exist.
-- Aurelien Jarno <aurel32@debian.org> Mon, 11 May 2009 10:56:10 +0200
Modified: glibc-package/trunk/debian/debhelper.in/locales.config
===================================================================
--- glibc-package/trunk/debian/debhelper.in/locales.config 2009-05-11 08:56:57 UTC (rev 3491)
+++ glibc-package/trunk/debian/debhelper.in/locales.config 2009-05-11 12:48:23 UTC (rev 3492)
@@ -51,9 +51,8 @@
DEFAULT_ENVIRONMENT="$(cat /etc/environment /etc/default/locale 2>/dev/null | awk 'BEGIN {lang="None"} /^LANG=/ {gsub("\"", ""); sub("LANG=", ""); lang=$0;} END {print lang}')"
DEFAULT_ENVIRONMENT="$(convert_locale "$DEFAULT_ENVIRONMENT")"
if ! echo "$SUPPORTED_LOCALES" | grep -q -e "\b$DEFAULT_ENVIRONMENT\b" ; then
- DEFAULT_ENVIRONMENT="None"
+ db_set locales/default_environment_locale "$DEFAULT_ENVIRONMENT"
fi
-db_set locales/default_environment_locale "$DEFAULT_ENVIRONMENT"
STATE=1
while [ "$STATE" -ge 0 ]; do
Reply to: