[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

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



Author: barbier
Date: 2006-04-05 20:58:54 +0000 (Wed, 05 Apr 2006)
New Revision: 1323

Modified:
   glibc-package/trunk/debian/changelog
   glibc-package/trunk/debian/debhelper.in/locales.config
Log:
  * debian/debhelper.in/locales.config: /etc/locale.gen was not generated at
    initial installation.  (Closes: #357523)


Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog	2006-04-04 19:32:17 UTC (rev 1322)
+++ glibc-package/trunk/debian/changelog	2006-04-05 20:58:54 UTC (rev 1323)
@@ -4,8 +4,12 @@
   * Split out timezone data in a separate package. It's a first step, it
     should finally be built from a separate source package.
 
- -- Denis Barbier <barbier@debian.org>  Tue,  4 Apr 2006 20:37:03 +0200
+  [ Denis Barbier ]
+  * debian/debhelper.in/locales.config: /etc/locale.gen was not generated at
+    initial installation.  (Closes: #357523)
 
+ -- Denis Barbier <barbier@debian.org>  Wed,  5 Apr 2006 22:53:28 +0200
+
 glibc (2.3.6-5) unstable; urgency=low
 
   [ Denis Barbier ]

Modified: glibc-package/trunk/debian/debhelper.in/locales.config
===================================================================
--- glibc-package/trunk/debian/debhelper.in/locales.config	2006-04-04 19:32:17 UTC (rev 1322)
+++ glibc-package/trunk/debian/debhelper.in/locales.config	2006-04-05 20:58:54 UTC (rev 1323)
@@ -34,7 +34,7 @@
 __SUPPORTED_LOCALES__"
 SUPPORTED_LOCALES=$( (cat $LG && echo "$SUPPORTED_LOCALES") | LC_ALL=C sed -e '/^[a-zA-Z]/!d' | LC_ALL=C sort -u | tr '\n' ',' | sed -e 's/,/, /g' -e 's/, *$//')
 
-if [ -z "$DEBCONF_IS_A_REGISTRY" ]; then
+if [ -z "$DEBCONF_IS_A_REGISTRY" ] && [ -e /etc/locale.gen ]; then
     db_set locales/locales_to_be_generated "${SELECTED_LOCALES}"
     db_set locales/default_environment_locale "$DEFAULT_ENVIRONMENT"
 fi



Reply to: