[SM-Commit] GIT changes to master grimoire by Jaka Kranjc (df567770bf169cb397dc59f8691ca49f6ecd09ef)
Jaka Kranjc
scm at mail.sourcemage.org
Thu Jun 29 11:12:06 EDT 2006
GIT changes to master grimoire by Jaka Kranjc <lynxlynxlynx at sourcemage.org>:
libs/glibc/CONFIGURE | 24 -----
libs/glibc/HISTORY | 12 ++
libs/glibc/INSTALL | 39 ---------
libs/glibc/PREPARE | 4
libs/glibc/PRE_INSTALL | 4
libs/glibc/UP_TRIGGERS | 4
libs/glibc/locales | 196 ------------------------------------------------
smgl/basesystem/DEPENDS | 1
smgl/basesystem/HISTORY | 3
9 files changed, 24 insertions(+), 263 deletions(-)
New commits:
commit df567770bf169cb397dc59f8691ca49f6ecd09ef
Author: Jaka Kranjc <lynxlynxlynx at sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx at sourcemage.org>
glibc, basesystem: fix 12552, use locale for generating locales
glibc: minor cleanup
diff --git a/libs/glibc/CONFIGURE b/libs/glibc/CONFIGURE
deleted file mode 100755
index 1badd27..0000000
--- a/libs/glibc/CONFIGURE
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# Don't use config_query here or you'll regret it ;)
-# If you do, after a user says 'y' to configuring the locales,
-# every subsequent recast will also pop up the locales menu until
-# glibc is recast with `cast -r glibc`, which would also remove
-# the selected locales and you'd need to reconfigure them again...
-#
-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` &&
- BACKTITLE="Glibc 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." &&
-
- GLIBC_LOCALES=`dialog --backtitle "$BACKTITLE" \
- --title "$TITLE" \
- --stdout \
- --checklist "$HELP" \
- 0 0 0 \
- $GLIBC_LOCALES_LIST`
-fi
diff --git a/libs/glibc/HISTORY b/libs/glibc/HISTORY
index c0139f9..83f4b8a 100644
--- a/libs/glibc/HISTORY
+++ b/libs/glibc/HISTORY
@@ -1,3 +1,15 @@
+2006-06-29 Jaka Kranjc <lynxlynxlynx at sourcemage.org>
+ * applied iuso's patch for separating locale generation (from devel) 12552
+ * PREPARE, INSTALL: use SMGL_COMPAT_ARCHS for 64b test
+ * PRE_INSTALL: removed duplicate tests
+ * UP_TRIGGERS: added for 12552
+
+2006-06-29 Juuso Alasuutari <iuso at sourcemage.org>
+ * INSTALL: Removed locale generation code.
+ * PREPARE: Removed locale query.
+ * CONFIGURE: Deleted, had only locale stuff.
+ * locale: Deleted.
+
2006-06-24 Thomas Orgis <sobukus at sourcemage.org>
* BUILD: added alpha headers/CFLAGS setup, made build fail for
unknown arch in a controlled way
diff --git a/libs/glibc/INSTALL b/libs/glibc/INSTALL
index 47a8b18..fa94d7d 100755
--- a/libs/glibc/INSTALL
+++ b/libs/glibc/INSTALL
@@ -41,7 +41,7 @@ #
# install
#
make install install_root="${INSTALL_ROOT}" &&
-if [[ "$HOST" == x86_64-* ]]; then
+if [[ ${SMGL_COMPAT_ARCHS[1]} == x86_64 ]]; then
[ -d /lib64 -a ! -f /lib64/ld-linux-x86-64.so.2 -a -f /lib/ld-linux-x86-64.so.2 ] &&
ln -s /lib/ld-linux-x86-64.so.2 /lib64/ld-linux-x86-64.so.2
true # see bug 8626 for info about this conditional
@@ -49,43 +49,6 @@ fi &&
( ldconfig || true ) &&
#
-# generate the localedef file from installed specs
-#
-local GLIBC_INPUTFILE GLIBC_CHARMAP GLIBC_LOCALE &&
-if [ -z "$GLIBC_LOCALES" ]; then
- local GLIBC_DESCRIPTION &&
- cat $SCRIPT_DIRECTORY/locales |
- while read GLIBC_LOCALE GLIBC_DESCRIPTION; do
- GLIBC_INPUTFILE=`echo $GLIBC_LOCALE | cut -d / -f1` &&
- GLIBC_CHARMAP=`echo $GLIBC_LOCALE | cut -d / -f2` &&
- mkdir -p ${INSTALL_ROOT}/usr/lib/locale/$GLIBC_INPUTFILE &&
- echo "localedef -f $GLIBC_CHARMAP -i $GLIBC_INPUTFILE $GLIBC_INPUTFILE" \
- " $GLIBC_DESCRIPTION" &&
- localedef --prefix=${INSTALL_ROOT} -i $GLIBC_INPUTFILE -f $GLIBC_CHARMAP \
- $GLIBC_INPUTFILE &&
- if [ "$GLIBC_UTF" = "y" ] &&
- ! [ "$GLIBC_CHARMAP" = "UTF-8" ]; then
- echo "localedef -f UTF-8 -i $GLIBC_INPUTFILE $GLIBCINPUTFILE.UTF-8 $GLIBC_DESCRIPTION" \
- " (UNICODE Charset)" &&
- localedef --prefix=${INSTALL_ROOT} -i $GLIBC_INPUTFILE -f UTF-8 $GLIBC_INPUTFILE.UTF-8
- fi
- done || true
-else
- for LOCALE in $GLIBC_LOCALES; do
- INPUTFILE=`echo $LOCALE | cut -d / -f1` &&
- CHARMAP=`echo $LOCALE | cut -d / -f2` &&
- mkdir -p ${INSTALL_ROOT}/usr/lib/locale/$INPUTFILE &&
- echo "localedef -f $CHARMAP -i $INPUTFILE $INPUTFILE" &&
- localedef --prefix=${INSTALL_ROOT} -i $INPUTFILE -f $CHARMAP $INPUTFILE &&
- if [ "$GLIBC_UTF" = "y" ] &&
- ! [ "$CHARMAP" = "UTF-8" ]; then
- echo "localedef -f UTF-8 -i $INPUTFILE $INPUTFILE.UTF-8" &&
- localedef --prefix=${INSTALL_ROOT} -i $INPUTFILE -f UTF-8 $INPUTFILE.UTF-8
- fi
- done || true
-fi &&
-
-#
# Now install sanitised glibc-kernel-headers
#
install -d ${INSTALL_ROOT}/usr/include &&
diff --git a/libs/glibc/PREPARE b/libs/glibc/PREPARE
index 62d2d25..ffbfcea 100755
--- a/libs/glibc/PREPARE
+++ b/libs/glibc/PREPARE
@@ -7,8 +7,6 @@ if [[ $(uname -r) = 2.6.* ]]; then
fi
fi &&
-config_query GLIBC_UTF "Would you like to generate UTF-8 locale data (Unicode) as well as the native charset data?" n
-
-if [[ "$HOST" == x86_64-* ]]; then
+if [[ ${SMGL_COMPAT_ARCHS[1]} == x86_64 ]]; then
config_query GLIBC_NOLIB64 "Shall the dynamic linker install to /lib (not /lib64) (lib64 purge part 2 of 2)?" n
fi
diff --git a/libs/glibc/PRE_INSTALL b/libs/glibc/PRE_INSTALL
index 756ede0..4cda515 100755
--- a/libs/glibc/PRE_INSTALL
+++ b/libs/glibc/PRE_INSTALL
@@ -12,10 +12,10 @@ if [ -z $INSTALL_ROOT ]; then
if [[ ${SMGL_COMPAT_ARCHS[1]} == ppc ]]; then
LD=$(readlink /lib/ld.so.1) &&
ln -sf $SOURCE_DIRECTORY.bld/old.libs/$LD /lib/ld.so.1
- elif [[ ${SMGL_COMPAT_ARCHS[1]} == x86_64 ]] && test -f /lib/ld-linux-x86-64.so.2 && [[ ${SMGL_COMPAT_ARCHS[1]} = "x86_64" ]]; then
+ elif [[ ${SMGL_COMPAT_ARCHS[1]} == x86_64 ]] && test -f /lib/ld-linux-x86-64.so.2; then
LD=$(readlink /lib/ld-linux-x86-64.so.2) &&
ln -sf $SOURCE_DIRECTORY.bld/old.libs/$LD /lib/ld-linux-x86-64.so.2
- elif [[ ${SMGL_COMPAT_ARCHS[1]} == x86_64 ]] && test -f /lib64/ld-linux-x86-64.so.2 && [[ ${SMGL_COMPAT_ARCHS[1]} = "x86_64" ]]; then
+ elif [[ ${SMGL_COMPAT_ARCHS[1]} == x86_64 ]] && test -f /lib64/ld-linux-x86-64.so.2; then
LD=$(readlink /lib64/ld-linux-x86-64.so.2) &&
ln -sf $SOURCE_DIRECTORY.bld/old.libs/$LD /lib64/ld-linux-x86-64.so.2
else
diff --git a/libs/glibc/UP_TRIGGERS b/libs/glibc/UP_TRIGGERS
new file mode 100755
index 0000000..23d6683
--- /dev/null
+++ b/libs/glibc/UP_TRIGGERS
@@ -0,0 +1,4 @@
+if ! spell_ok locale; then
+ up_trigger locale cast_self
+ echo
+fi
diff --git a/libs/glibc/locales b/libs/glibc/locales
deleted file mode 100755
index aaa4c8a..0000000
--- a/libs/glibc/locales
+++ /dev/null
@@ -1,196 +0,0 @@
-aa_DJ/ISO-8859-1 Afar_locale_for_Djibouti_(Cadu/Laaqo_Dialects) off
-aa_ER/UTF-8 Afar_locale_for_Eritrea_(Cadu/Laaqo_Dialects) off
-aa_ER at saaho/UTF-8 Afar_locale_for_Eritrea_(Saaho_Dialect) off
-aa_ET/UTF-8 Afar_locale_for_Ethiopia_(Cadu/Carra_Dialects) off
-af_ZA/ISO-8859-1 Afrikaans_locale_for_South_Africa off
-am_ET/UTF-8 Amharic_locale_for_Ethiopia off
-an_ES/ISO-8859-15 Aragonese_locale_for_Spain off
-ar_AE/ISO-8859-6 Arabic_locale_for_United_Arab_Emirates off
-ar_BH/ISO-8859-6 Arabic_locale_for_Bahrain off
-ar_DZ/ISO-8859-6 Arabic_locale_for_Algeria off
-ar_EG/ISO-8859-6 Arabic_locale_for_Egypt off
-ar_IN/ISO-8859-6 Arabic_locale_for_India off
-ar_IQ/ISO-8859-6 Arabic_locale_for_Iraq off
-ar_JO/ISO-8859-6 Arabic_locale_for_Jordan off
-ar_KW/ISO-8859-6 Arabic_locale_for_Kuwait off
-ar_LB/ISO-8859-6 Arabic_locale_for_Lebanon off
-ar_LY/ISO-8859-6 Arabic_locale_for_Libyan_Arab_Jamahiriya off
-ar_MA/ISO-8859-6 Arabic_locale_for_Morocco off
-ar_OM/ISO-8859-6 Arabic_locale_for_Oman off
-ar_QA/ISO-8859-6 Arabic_locale_for_Qatar off
-ar_SA/ISO-8859-6 Arabic_locale_for_Saudi_Arabia off
-ar_SD/ISO-8859-6 Arabic_locale_for_Sudan off
-ar_SY/ISO-8859-6 Arabic_locale_for_Syrian_Arab_Republic off
-ar_TN/ISO-8859-6 Arabic_locale_for_Tunisia off
-ar_YE/ISO-8859-6 Arabic_locale_for_Yemen off
-be_BY/CP1251 Belarusian_locale_for_Belarus off
-bg_BG/CP1251 Bulgarian_locale_for_Bulgaria off
-br_FR/ISO-8859-1 Breton_locale_for_France off
-br_FR at euro/ISO-8859-15 Breton_locale_for_France_with_Euro off
-bs_BA/ISO-8859-2 Bosnian_locale_for_Bosnia_and_Herzegowina off
-byn_ER/UTF-8 Blin_locale_for_Eritrea off
-ca_ES/ISO-8859-1 Catalan_locale_for_Catalonia off
-ca_ES at euro/ISO-8859-15 Catalan_locale_for_Catalonia_with_Euro off
-cs_CZ/ISO_8859-2 Czech_locale_for_the_Czech_Republic off
-cy_GB/ISO-8859-14 Welsh_locale_for_Great_Britain off
-da_DK/ISO-8859-1 Danish_locale_for_Denmark off
-de_AT/ISO-8859-1 German_locale_for_Austria off
-de_AT at euro/ISO-8859-15 German_locale_for_Austria_with_Euro off
-de_BE/ISO-8859-1 German_locale_for_Belgium off
-de_BE at euro/ISO-8859-15 German_locale_for_Belgium_with_Euro off
-de_CH/ISO-8859-1 German_locale_for_Switzerland off
-de_DE/ISO-8859-1 German_locale_for_Germany off
-de_DE at euro/ISO-8859-15 German_locale_for_Germany_with_Euro off
-de_LU/ISO-8859-1 German_locale_for_Luxemburg off
-de_LU at euro/ISO-8859-15 German_locale_for_Luxemburg_with_Euro off
-el_GR/ISO-8859-7 Greek_locale_for_Greece off
-el_GR at euro/UTF-8 Greek_locale_for_Greece_with_Euro off
-en_AU/ISO-8859-1 English_locale_for_Australia off
-en_BW/ISO-8859-1 English_locale_for_Botswana off
-en_CA/ISO-8859-1 English_locale_for_Canada off
-en_DK/ISO_8859-1 English_locale_for_Denmark off
-en_GB/ISO-8859-1 English_locale_for_Britain off
-en_HK/ISO-8859-1 English_locale_for_Hong_Kong off
-en_IE/ISO-8859-1 English_locale_for_Ireland off
-en_IE at euro/ISO-8859-15 English_locale_for_Ireland_with_Euro off
-en_IN/ISO-8859-1 English_locale_for_India off
-en_NZ/ISO-8859-1 English_locale_for_New_Zealand off
-en_PH/ISO-8859-1 English_locale_for_Philippines off
-en_SG/ISO-8859-1 English_locale_for_Singapore off
-en_US/ISO-8859-1 English_locale_for_the_USA off
-en_ZA/ISO-8859-1 English_locale_for_South_Africa off
-en_ZW/ISO-8859-1 English_locale_for_Zimbabwe off
-es_AR/ISO-8859-1 Spanish_locale_for_Argentina off
-es_BO/ISO-8859-1 Spanish_locale_for_Bolivia off
-es_CL/ISO-8859-1 Spanish_locale_for_Chile off
-es_CO/ISO-8859-1 Spanish_locale_for_Colombia off
-es_CR/ISO-8859-1 Spanish_locale_for_Costa_Rica off
-es_DO/ISO-8859-1 Spanish_locale_for_Dominican_Republic off
-es_EC/ISO-8859-1 Spanish_locale_for_Ecuador off
-es_ES/ISO-8859-1 Spanish_locale_for_Spain off
-es_ES at euro/ISO-8859-15 Spanish_locale_for_Spain_with_Euro off
-es_GT/ISO-8859-1 Spanish_locale_for_Guatemala off
-es_HN/ISO-8859-1 Spanish_locale_for_Honduras off
-es_MX/ISO-8859-1 Spanish_locale_for_Mexico off
-es_NI/ISO-8859-1 Spanish_locale_for_Nicaragua off
-es_PA/ISO-8859-1 Spanish_locale_for_Panama off
-es_PE/ISO-8859-1 Spanish_locale_for_Peru off
-es_PR/ISO-8859-1 Spanish_locale_for_Puerto_Rico off
-es_PY/ISO-8859-1 Spanish_locale_for_Paraguay off
-es_SV/ISO-8859-1 Spanish_locale_for_El_Salvador off
-es_US/ISO-8859-1 Spanish_locale_for_the_USA off
-es_UY/ISO-8859-1 Spanish_locale_for_Uruguay off
-es_VE/ISO-8859-1 Spanish_locale_for_Venezuela off
-et_EE/ISO-8859-1 Estonian_locale_for_Estonia off
-eu_ES/ISO-8859-1 Basque_locale_for_Spain off
-eu_ES at euro/ISO-8859-15 Basque_locale_for_Spain_with_Euro off
-fa_IR/UTF-8 Persian_locale_for_Iran off
-fi_FI/ISO-8859-1 Finnish_locale_for_Finland off
-fi_FI at euro/ISO-8859-15 Finnish_locale_for_Finland_with_Euro off
-fo_FO/ISO-8859-1 Faroese_locale_for_Faroe_Islands off
-fr_BE/ISO-8859-1 French_locale_for_Belgium off
-fr_BE at euro/ISO-8859-15 French_locale_for_Belgium_with_Euro off
-fr_CA/ISO-8859-1 French_locale_for_Canada off
-fr_CH/ISO-8859-1 French_locale_for_Switzerland off
-fr_FR/ISO-8859-1 French_locale_for_France off
-fr_FR at euro/ISO-8859-15 French_locale_for_France_with_Euro off
-fr_LU/ISO-8859-1 French_locale_for_Luxemburg off
-fr_LU at euro/ISO-8859-15 French_locale_for_Luxemburg_with_Euro off
-ga_IE/ISO-8859-1 Irish_locale_for_Ireland off
-ga_IE at euro/ISO-8859-15 Irish_locale_for_Ireland_with_Euro off
-gd_GB/ISO_8859-15 Scots_Gaelic_locale_for_Great_Britain off
-gez_ER/UTF-8 Ge'ez_locale_for_Eritrea off
-gez_ER at abegede/UTF-8 Ge'ez_locale_for_Eritrea_With_Abegede_Collation off
-gez_ET/UTF-8 Ge'ez_locale_for_Ethiopia off
-gez_ET at abegede/UTF-8 Ge'ez_locale_for_Ethiopia_With_Abegede_Collation off
-gl_ES/ISO-8859-1 Galician_locale_for_Spain off
-gl_ES at euro/ISO-8859-15 Galician_locale_for_Spain_with_Euro off
-gu_IN/UTF-8 Gujarati_locale_for_India off
-gv_GB/ISO-8859-1 Manx_Gaelic_locale_for_Britain off
-he_IL/ISO-8859-8 Hebrew_locale_for_Israel off
-hi_IN/UTF-8 Hindi_locale_for_India off
-hr_HR/ISO-8859-2 Croatian_locale_for_Croatia off
-hu_HU/ISO-8859-2 Hungarian_locale_for_Hungary off
-id_ID/ISO-8859-1 Indonesian_locale_for_Indonesia off
-is_IS/ISO-8859-1 Icelandic_locale_for_Iceland off
-it_CH/ISO-8859-1 Italian_locale_for_Switzerland off
-it_IT/ISO-8859-1 Italian_locale_for_Italy off
-it_IT at euro/ISO-8859-15 Italian_locale_for_Italy_with_Euro off
-iw_IL/ISO-8859-8 Hebrew_locale_for_Israel off
-ja_JP/EUC-JP Japanese_locale_for_Japan off
-ka_GE/GEORGIAN-PS Georgian_locale_for_Georgia off
-kl_GL/ISO-8859-1 Greenlandic_locale_for_Greenland off
-kn_IN/UTF-8 Kannada_locale_for_India off
-ko_KR/EUC-KR Korean_locale_for_Republic_of_Korea off
-kw_GB/ISO-8859-1 Cornish_locale_for_Britain off
-lo_LA/UTF-8 Lao_locale_for_Laos off
-lt_LT/ISO-8859-13 Lithuanian_locale_for_Lithuania off
-lug_UG/ISO-8859-10 Luganda_locale_for_Uganda off
-lv_LV/ISO-8859-13 Latvian_locale_for_Latvia off
-mi_NZ/ISO-8859-13 Maori_locale_for_New_Zealand off
-mk_MK/UTF-8 Macedonian_locale_for_Macedonia off
-ml_IN/UTF-8 Malayalam_locale_for_India off
-mn_MN/UTF-8 Mongolian_locale_for_Mongolia off
-mr_IN/UTF-8 Marathi_locale_for_India off
-ms_MY/ISO-8859-1 Malay_locale_for_Malaysia off
-mt_MT/ISO-8859-3 Maltese_locale_for_Malta off
-nb_NO/ISO-8859-1 Norwegian_(Bokmal)_locale_for_Norway off
-ne_NP/UTF-8 Nepali_locale_for_Nepal off
-nl_BE/ISO-8859-1 Dutch_locale_for_Belgium off
-nl_BE at euro/ISO-8859-15 Dutch_locale_for_Belgium_with_Euro off
-nl_NL/ISO-8859-1 Dutch_locale_for_the_Netherlands off
-nl_NL at euro/ISO-8859-15 Dutch_locale_for_the_Netherlands_with_Euro off
-nn_NO/ISO-8859-1 Nynorsk_locale_for_Norway off
-oc_FR/ISO_8859-1 Occitan_Locale_for_France off
-om_ET/UTF-8 Oromo_locale_for_Ethiopia off
-om_KE/ISO-8859-1 Oromo_locale_for_Kenya off
-pa_IN/UTF-8 Punjabi_locale_for_India off
-pl_PL/ISO-8859-2 Polish_locale_for_Poland off
-pt_BR/ISO-8859-1 Portuguese_locale_for_Brasil off
-pt_PT/ISO-8859-1 Portuguese_locale_for_Portugal off
-pt_PT at euro/ISO-8859-15 Portuguese_locale_for_Portugal_with_Euro off
-ro_RO/ISO-8859-2 Romanian_locale_for_Romania off
-ru_RU/ISO-8859-5 Russian_locale_for_Russia off
-ru_RU/KOI8-R Russian_locale_for_Russia off
-ru_UA/KOI8-U Russian_locale_for_Ukraine off
-se_NO/UTF-8 Northern_Saami_locale_for_Norway off
-sid_ET/UTF-8 Sidama_locale_for_Ethiopia off
-sk_SK/ISO-8859-2 Slovak_locale_for_Slovak off
-sl_SI/ISO-8859-2 Slovenian_locale_for_Slovenia off
-so_DJ/ISO-8859-1 Somali_locale_for_Djibouti off
-so_ET/UTF-8 Somali_locale_for_Ethiopia off
-so_KE/ISO-8859-1 Somali_locale_for_Kenya off
-so_SO/ISO-8859-1 Somali_locale_for_Somalia off
-sq_AL/ISO-8859-1 Albanian_locale_for_Albania off
-sr_YU/ISO-8859-2 Serbian_locale_for_Yugoslavia off
-sr_YU at cyrillic/ISO-8859-5 Serbian_locale_for_Yugoslavia off
-st_ZA/ISO-8859-1 Sotho_locale_for_South_Africa off
-sv_FI/ISO-8859-1 Swedish_locale_for_Finland off
-sv_FI at euro/ISO-8859-15 Swedish_locale_for_Finland_with_Euro off
-sv_SE/ISO-8859-1 Swedish_locale_for_Sweden off
-ta_IN/UTF-8 Tamil_locale_for_India off
-te_IN/UTF-8 Telgu_locale_for_India off
-tg_TJ/KOI8-T Tajik_locale_for_Tajikistan off
-th_TH/TIS-620 Thai_locale_for_Thailand off
-ti_ER/UTF-8 Tigrigna_locale_for_Eritrea off
-ti_ET/UTF-8 Tigrigna_locale_for_Ethiopia off
-tig_ER/UTF-8 Tigre_locale_for_Eritrea off
-tl_PH/ISO-8859-1 Tagalog_locale_for_Philippines off
-tr_TR/ISO-8859-9 Turkish_locale_for_Turkey off
-uk_UA/KOI8-U Ukrainian_locale_for_Ukraine off
-ur_PK/CP1256 Urdu_Locale_for_Pakistan off
-uz_UZ/UTF-8 Uzbek_(latin)_locale_for_Uzbekistan off
-uz_UZ at cyrillic/UTF-8 Uzbek_(cyrillic)_locale_for_Uzbekistan off
-vi_VN/UTF-8 Vietnamese_locale_for_Vietnam off
-wa_BE/ISO_8859-1 Walloon_Locale_for_Belgium off
-wa_BE at euro/ISO-8859-15 Walloon_locale_for_Belgium_with_Euro off
-xh_ZA/UTF-8 Xhosa_locale_for_South_Africa off
-yi_US/CP1255 Yiddish_locale off
-zh_CN/GB18030 Chinese_locale_for_Peoples_Republic_of_China off
-zh_CN/GB2312 Chinese_locale_for_Peoples_Republic_of_China off
-zh_CN/GBK Chinese_locale_for_Peoples_Republic_of_China off
-zh_HK/BIG5-HKSCS Chinese_locale_for_Hong_Kong off
-zh_TW/BIG5 Chinese_locale_for_Taiwan_R.O.C off
-zh_TW/EUC-TW Chinese_locale_for_Taiwan_R.O.C off
-zh_SG/UTF-8 Chinese_locale_for_Singapore off
-zu_ZA/UTF-8 Zulu_locale_for_South_Africa off
diff --git a/smgl/basesystem/DEPENDS b/smgl/basesystem/DEPENDS
index cf2b006..df3ba16 100755
--- a/smgl/basesystem/DEPENDS
+++ b/smgl/basesystem/DEPENDS
@@ -18,6 +18,7 @@ depends iana-etc &&
depends init.d &&
depends installwatch &&
depends less &&
+depends locale &&
depends make &&
depends module-init-tools &&
depends nano &&
diff --git a/smgl/basesystem/HISTORY b/smgl/basesystem/HISTORY
index 8a53853..59ba0d6 100644
--- a/smgl/basesystem/HISTORY
+++ b/smgl/basesystem/HISTORY
@@ -1,3 +1,6 @@
+2006-06-29 Jaka Kranjc <lynxlynxlynx at sourcemage.org>
+ * DEPENDS: added locale for #12522
+
2006-03-14 Ladislav Hagara <hgr at vabo.cz>
* DEPENDS: UTIL-LINUX -> util-linux, deprecated util-linux-crypto
More information about the SM-Commit
mailing list