r1269 - in glibc-package/trunk/debian: . debhelper.in
Author: barbier
Date: 2006-03-06 21:36:37 +0000 (Mon, 06 Mar 2006)
New Revision: 1269
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/debhelper.in/locales.config
Log:
* locales.config: If $DEBCONF_IS_A_REGISTRY is set to a non-empty value,
the content of /etc/locale.gen does not override debconf values.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2006-03-06 20:55:01 UTC (rev 1268)
+++ glibc-package/trunk/debian/changelog 2006-03-06 21:36:37 UTC (rev 1269)
@@ -1,5 +1,6 @@
glibc (2.3.6-4) UNRELEASED; urgency=low
+ [ Aurelien Jarno ]
* Set configure_build to the same value as configure_host for sparc
optimized libraries (as on i386). This way they will be tested.
* If the CPU has biarch support, run tests for cross-compiled libraries.
@@ -10,9 +11,13 @@
* Add tst-setcontext_c.diff (fix the arguments passed to setcontext during
test) from upstream.
* Create a link /usr/lib32 -> /emul/ia32-linux/usr/lib on amd64.
-
- -- Aurelien Jarno <aurel32@debian.org> Thu, 2 Mar 2006 05:10:12 +0100
+ [ Denis Barbier ]
+ * locales.config: If $DEBCONF_IS_A_REGISTRY is set to a non-empty value,
+ the content of /etc/locale.gen does not override debconf values.
+
+ -- Denis Barbier <barbier@debian.org> Mon, 6 Mar 2006 00:40:52 +0100
+
glibc (2.3.6-3) unstable; urgency=low
[ Aurelien Jarno]
Modified: glibc-package/trunk/debian/debhelper.in/locales.config
===================================================================
--- glibc-package/trunk/debian/debhelper.in/locales.config 2006-03-06 20:55:01 UTC (rev 1268)
+++ glibc-package/trunk/debian/debhelper.in/locales.config 2006-03-06 21:36:37 UTC (rev 1269)
@@ -33,8 +33,10 @@
__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/, *$//')
-db_set locales/locales_to_be_generated "${SELECTED_LOCALES}"
-db_set locales/default_environment_locale "$DEFAULT_ENVIRONMENT"
+if [ -z "$DEBCONF_IS_A_REGISTRY" ]; then
+ db_set locales/locales_to_be_generated "${SELECTED_LOCALES}"
+ db_set locales/default_environment_locale "$DEFAULT_ENVIRONMENT"
+fi
db_subst locales/locales_to_be_generated locales "${SUPPORTED_LOCALES}"
STATE=1
Reply to: