r3187 - in glibc-package/trunk/debian: . debhelper.in

[aurel32@alioth.debian.org]

Author: aurel32
Date: 2008-11-04 15:32:31 +0000 (Tue, 04 Nov 2008)
New Revision: 3187

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/locales does not exists.



Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog	2008-11-03 23:44:05 UTC (rev 3186)
+++ glibc-package/trunk/debian/changelog	2008-11-04 15:32:31 UTC (rev 3187)
@@ -6,8 +6,10 @@
     atomic lock on s390.  Closes: bug#468793, bug#479952.
   * patches/any/cvs-gai-stacksize.diff new patch from upstream to fix
     getaddrinfo_a segfaults.  Closes: bug#495007.
+  * debhelper.in/locales.config: use previous debconf settings if 
+    /etc/locales does not exists.
 
- -- Aurelien Jarno <aurel32@debian.org>  Tue, 04 Nov 2008 00:43:00 +0100
+ -- Aurelien Jarno <aurel32@debian.org>  Tue, 04 Nov 2008 16:31:04 +0100
 
 glibc (2.7-15) unstable; urgency=low
 

Modified: glibc-package/trunk/debian/debhelper.in/locales.config
===================================================================
--- glibc-package/trunk/debian/debhelper.in/locales.config	2008-11-03 23:44:05 UTC (rev 3186)
+++ glibc-package/trunk/debian/debhelper.in/locales.config	2008-11-04 15:32:31 UTC (rev 3187)
@@ -36,24 +36,24 @@
 
 # List of supported locales (PROVIDED_LOCALES + USER_LOCALES + GEN_LOCALES)
 SUPPORTED_LOCALES="$(echo -e "$PROVIDED_LOCALES\n$USER_LOCALES\n$GEN_LOCALES" | grep -v "^$" | sort -u | tr '\n' ',' | sed -e 's/, */, /g' -e 's/, *$//g')"
+db_subst locales/locales_to_be_generated locales "$SUPPORTED_LOCALES"
 
 # Get the list of selected locales from /etc/locale.gen
-if [ -L $LG ] && [ "$(readlink $LG)" = "/usr/share/i18n/SUPPORTED" ]; then
-    SELECTED_LOCALES="All locales"
-else
-    SELECTED_LOCALES="$(echo "$GEN_LOCALES" | sort -u | tr '\n' ',' | sed -e 's/, */, /g' -e 's/, *$//g')"
+if [ -e /etc/locale.gen ]; then
+    if [ -L $LG ] && [ "$(readlink $LG)" = "/usr/share/i18n/SUPPORTED" ]; then
+        SELECTED_LOCALES="All locales"
+    else
+        SELECTED_LOCALES="$(echo "$GEN_LOCALES" | sort -u | tr '\n' ',' | sed -e 's/, */, /g' -e 's/, *$//g')"
+    fi
+    db_set locales/locales_to_be_generated "$SELECTED_LOCALES"
 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}')"
 DEFAULT_ENVIRONMENT="$(convert_locale "$DEFAULT_ENVIRONMENT")"
-
 if ! echo "$SUPPORTED_LOCALES" | grep -q -e "\b$DEFAULT_ENVIRONMENT\b" ; then
     DEFAULT_ENVIRONMENT="None"
 fi
-
-db_set locales/locales_to_be_generated "$SELECTED_LOCALES"
 db_set locales/default_environment_locale "$DEFAULT_ENVIRONMENT"
-db_subst locales/locales_to_be_generated locales "$SUPPORTED_LOCALES"
 
 STATE=1
 while [ "$STATE" -ge 0 ]; do