r966 - in glibc-package/trunk/debian: . debhelper.in
Author: gotom
Date: 2005-07-22 14:14:52 +0000 (Fri, 22 Jul 2005)
New Revision: 966
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/debhelper.in/locales.config
glibc-package/trunk/debian/debhelper.in/locales.postinst
Log:
* Denis Barbier <barbier@debian.org>:
- debian/debhelper.in/locales.config: Use LANG=C for locale-dependent
commands. (Closes: #314717)
- debian/debhelper.in/locales.postinst: Likewise.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2005-07-22 13:15:34 UTC (rev 965)
+++ glibc-package/trunk/debian/changelog 2005-07-22 14:14:52 UTC (rev 966)
@@ -43,6 +43,11 @@
linuxthreads locking problem and sysdeps correctly again.
- debian/patches/glibc235-hppa-lt.dpatch: New file, likewise.
+ * Denis Barbier <barbier@debian.org>:
+ - debian/debhelper.in/locales.config: Use LANG=C for locale-dependent
+ commands. (Closes: #314717)
+ - debian/debhelper.in/locales.postinst: Likewise.
+
-- GOTO Masanori <gotom@debian.org> Sun, 17 Jul 2005 17:27:30 +0900
glibc (2.3.5-2) experimental; urgency=low
Modified: glibc-package/trunk/debian/debhelper.in/locales.config
===================================================================
--- glibc-package/trunk/debian/debhelper.in/locales.config 2005-07-22 13:15:34 UTC (rev 965)
+++ glibc-package/trunk/debian/debhelper.in/locales.config 2005-07-22 14:14:52 UTC (rev 966)
@@ -15,7 +15,7 @@
# With current implementation, this string has to be removed.
grep -q "Leave alone" $LG && sed -e '/^Leave alone/d' $LG > $LG.tmp && mv $LG.tmp $LG
- SELECTED_LOCALES=$(sed -e '/^[a-zA-Z]/!d' $LG | tr '\n' ',' | sed -e 's/,/, /g' -e 's/, *$//')
+ SELECTED_LOCALES=$(LC_ALL=C sed -e '/^[a-zA-Z]/!d' $LG | tr '\n' ',' | sed -e 's/,/, /g' -e 's/, *$//')
db_set locales/locales_to_be_generated "${SELECTED_LOCALES}"
else
LG=/dev/null
@@ -29,7 +29,7 @@
# Add a newline in case /etc/locale.gen has no trailing newline at EOF
SUPPORTED_LOCALES="
__SUPPORTED_LOCALES__"
-SUPPORTED_LOCALES=$( (cat $LG && echo "$SUPPORTED_LOCALES") | sed -e '/^[a-zA-Z]/!d' | sort -u | tr '\n' ',' | sed -e 's/,/, /g' -e 's/, *$//')
+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_subst locales/locales_to_be_generated locales "${SUPPORTED_LOCALES}"
STATE=1
Modified: glibc-package/trunk/debian/debhelper.in/locales.postinst
===================================================================
--- glibc-package/trunk/debian/debhelper.in/locales.postinst 2005-07-22 13:15:34 UTC (rev 965)
+++ glibc-package/trunk/debian/debhelper.in/locales.postinst 2005-07-22 14:14:52 UTC (rev 966)
@@ -15,7 +15,7 @@
if [ -n "$SELECTED_LOCALES" ]; then
if [ -e $LG ]; then
# Comment previous defined locales
- sed -e 's/^[a-zA-Z]/#&/' $LG > $LG.tmp || true
+ LC_ALL=C sed -e 's/^[a-zA-Z]/#&/' $LG > $LG.tmp || true
mv -f $LG.tmp $LG
last=`tail -n 1 "$LG"`
if test -n "$last"; then echo >> $LG; fi
@@ -45,7 +45,7 @@
IFS=$save_IFS
else
if [ -e $LG ]; then
- sed -e 's/^[a-zA-Z]/#&/' $LG > $LG.tmp || true
+ LC_ALL=C sed -e 's/^[a-zA-Z]/#&/' $LG > $LG.tmp || true
mv -f $LG.tmp $LG
fi
fi
Reply to: