From: Perforce Review Daemon <p4review AT smee.org>
To: "Andraž " ruskie " Levstik" <ruskie AT mages.ath.cx>, "Andrew Stitt" <a AT t.armory.com>, "Arjan Bouter" <abouter AT gmail.com>, "Arwed von Merkatz" <v.merkatz AT gmx.net>, "SM-Commit Daemon" <sm-commit AT lists.ibiblio.org>, "David Kowis" <dkowis+smgl-p4 AT shlrm.org>, "duane_malcolm" <d.malcolm AT auckland.ac.nz>, "Eric Sandall" <eric AT sandall.us>, "Ethan Grammatikidis" <eekee AT eekee.is-a-geek.org>, "Gareth Clay" <gareth AT caffeinefuelled.co.uk>, "George J. Sherwood" <george AT beernabeer.com>, "Jason Flatt" <jflatt AT sourcemage.org>, "Jeremy Blosser" <jblosser AT sourcemage.org>, "Juuso Alasuutari" <iuso AT sourcemage.org>, "Ladislav Hagara" <ladislav.hagara AT unob.cz>, "Maurizio Boriani" <baux AT member.fsf.org>, "Pieter Lenaerts" <e-type AT sourcemage.org>, "Pol Vinogradov" <vin.public AT gmail.com>, "Robin Cook" <rcook AT wyrms.net>, "Unet" <unet AT sourcemage.org>, "vladimir_marek" <vlmarek AT volny.cz>
Subject: [SM-Commit] PERFORCE change 76646 by Arwed von Merkatz for review
Date: Thu, 23 Mar 2006 21:10:10 +0000 (GMT)
Change 76646 by arwed_von_merkatz@arwed-Otherland on 2006/03/23 21:08:54
fix generation of utf8 locales (and general variable cleanup)
@@ -1,4 +1,8 @@
-config_query LOCALE_UTF "Would you like to generate UTF-8 locale data
(Unicode) as well as the native charset data?" y
+if [ -z "$LOCAL_UTF" ]; then
+ LOCALE_UTF=${GLIBC_UTF:-y}
+fi &&
+config_query LOCALE_UTF "Would you like to generate UTF-8 locale data
(Unicode) as well as the native charset data?" y &&
+persistent_remove GLIBC_UTF &&
#
# Don't use config_query here or you'll regret it ;)
# If you do, after a user says 'y' to configuring the locales,
@@ -6,20 +10,27 @@
# locale is recast with `cast -r locale`, which would also remove
# the selected locales and you'd need to reconfigure them again...
#
+if [ -z "$LOCALE_LOCALES" ]; then
+ if [ "$GLIBC_LOCALES" ]; then
+ persistent_add LOCALE_LOCALES &&
+ LOCALE_LOCALES=${GLIBC_LOCALES}
+ fi
+fi &&
+persistent_remove GLIBC_LOCALES &&
if query "Would you like to select locales?" n; then
- local GLIBC_LOCALES_LIST &&
- persistent_add GLIBC_LOCALES &&
- GLIBC_LOCALES_LIST=`cat $SCRIPT_DIRECTORY/locales` &&
+ local LOCALE_LOCALES_LIST &&
+ persistent_add LOCALE_LOCALES &&
+ LOCALE_LOCALES_LIST=`cat $SCRIPT_DIRECTORY/locales` &&
BACKTITLE="Locale Configuration" &&
TITLE="Locale Selection" &&
HELP="Translated messages are automatically installed, but the locale
database that controls other behavior is not.
Please select desired locale or locales.
If none are selected then all will be installed." &&
@@ -1,3 +1,9 @@
+2006-03-23 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DETAILS: updated version to 0.0.2
+ * CONFIGURE, INSTALL: use LOCALE_ for all variable names instead of
+ GLIBC_, fixes utf8 locale generation as that used both,
+ default to old values of GLIBC_ variables, persistent_remove those
+
2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
* DETAILS: (automated) Add KEYWORDS