r1643 - in glibc-package/trunk/debian: . debhelper.in
Author: barbier
Date: 2006-06-08 21:17:49 +0000 (Thu, 08 Jun 2006)
New Revision: 1643
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/debhelper.in/locales.config
Log:
debian/debhelper.in/locales.config: some programs keep modifying
/etc/environment to store locale variables, so read /etc/environment
even when upgrading new versions. Of course, /etc/default/locale has
still a higher precedence over /etc/environment. (Closes: #363644)
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2006-06-08 19:16:36 UTC (rev 1642)
+++ glibc-package/trunk/debian/changelog 2006-06-08 21:17:49 UTC (rev 1643)
@@ -12,6 +12,10 @@
[ Denis Barbier ]
* debian/main/control.in: also make locales Conflicts: belocs-locales-bin.
+ * debian/debhelper.in/locales.config: some programs keep modifying
+ /etc/environment to store locale variables, so read /etc/environment
+ even when upgrading new versions. Of course, /etc/default/locale has
+ still a higher precedence over /etc/environment. (Closes: #363644)
-- Aurelien Jarno <aurel32@debian.org> Thu, 8 Jun 2006 08:03:49 +0200
Modified: glibc-package/trunk/debian/debhelper.in/locales.config
===================================================================
--- glibc-package/trunk/debian/debhelper.in/locales.config 2006-06-08 19:16:36 UTC (rev 1642)
+++ glibc-package/trunk/debian/debhelper.in/locales.config 2006-06-08 21:17:49 UTC (rev 1643)
@@ -23,16 +23,8 @@
else
LG=/dev/null
fi
-DEFAULT_ENVIRONMENT=None
-EE="/etc/default/locale"
-# Prior to locales 2.3.6-5, variables were stored in /etc/environment
-if [ "$1" = "configure" ] && [ -e "/etc/environment" ] && dpkg --compare-versions "$2" lt 2.3.6-5
-then
- EE="/etc/environment"
-fi
-if [ -e "$EE" ]; then
- DEFAULT_ENVIRONMENT=$(awk 'BEGIN {lang="None"} /^LANG=/ {gsub("\"", ""); sub("LANG=", ""); lang=$0;} END {print lang}' $EE)
-fi
+DEFAULT_ENVIRONMENT=$(cat /etc/environment /etc/default/locale 2>/dev/null | awk 'BEGIN {lang="None"} /^LANG=/ {gsub("\"", ""); sub("LANG=", ""); lang=$0;} END {print lang}')
+[ -n "$DEFAULT_ENVIRONMENT" ] || DEFAULT_ENVIRONMENT=None
# Add a newline in case /etc/locale.gen has no trailing newline at EOF
SUPPORTED_LOCALES="
Reply to: