summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2015-07-17 02:16:59 -0700
committerMike Frysinger <vapier@gentoo.org>2015-07-20 22:09:07 -0400
commit536fb977807bf15f56d1ad23111e3f1a849c3030 (patch)
treee2d29d9c1f0329827cfea2a46987832a1f59461c
parent7fde904c73c57faea48c9679bbdc0932d81b3a2f (diff)
downloadglibc-536fb977807bf15f56d1ad23111e3f1a849c3030.tar.gz
Reflect renaming of bh_IN and tu_IN in SUPPORTED file [BZ #17475]
-rw-r--r--ChangeLog6
-rw-r--r--benchtests/strcoll-inputs/filelist#en_US.UTF-84
-rw-r--r--localedata/ChangeLog9
-rw-r--r--localedata/SUPPORTED4
4 files changed, 17 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 52e1837914..3f8a6b6259 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2015-07-21 Khem Raj <raj.khem@gmail.com>
+
+ [BZ #17475]
+ * benchtests/strcoll-inputs/filelist#en_US.UTF-8: Adjust for rename
+ of tu_IN and bh_IN.
+
2015-07-21 Mike Frysinger <vapier@gentoo.org>
[BZ #18694]
diff --git a/benchtests/strcoll-inputs/filelist#en_US.UTF-8 b/benchtests/strcoll-inputs/filelist#en_US.UTF-8
index c9f1427699..151dffe77e 100644
--- a/benchtests/strcoll-inputs/filelist#en_US.UTF-8
+++ b/benchtests/strcoll-inputs/filelist#en_US.UTF-8
@@ -11409,7 +11409,7 @@ aa_DJ
translit_hangul
ar_EG
fi_FI
-bh_IN
+bhb_IN
en_CA
aa_ER
niu_NU
@@ -11620,7 +11620,7 @@ om_KE
or_IN
en_DK
wae_CH
-tu_IN
+tcy_IN
vi_VN
ber_MA
gd_GB
diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index acc1448786..030326b84b 100644
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,3 +1,8 @@
+2015-07-21 Khem Raj <raj.khem@gmail.com>
+
+ [BZ #17475]
+ * SUPPORTED: Rename tu_IN to tcy_IN and bh_IN to bhb_IN.
+
2015-07-20 Chris Metcalf <cmetcalf@ezchip.com>
* tst-leaks.c (TIMEOUT): Bump up to 5 seconds.
@@ -5,8 +10,8 @@
2015-07-15 Pravin Satpute <psatpute@redhat.com>
[BZ #17475]
- * locales/tu_IN: renamed to tcy_IN
- * locales/bh_IN: renamed to bhb_IN
+ * locales/tu_IN: renamed to tcy_IN.
+ * locales/bh_IN: renamed to bhb_IN.
2015-05-16 Carlos O'Donell <carlos@redhat.com>
diff --git a/localedata/SUPPORTED b/localedata/SUPPORTED
index 9bf2a4f384..8ca023e0bc 100644
--- a/localedata/SUPPORTED
+++ b/localedata/SUPPORTED
@@ -62,7 +62,7 @@ ber_DZ/UTF-8 \
ber_MA/UTF-8 \
bg_BG.UTF-8/UTF-8 \
bg_BG/CP1251 \
-bh_IN.UTF-8/UTF-8 \
+bhb_IN.UTF-8/UTF-8 \
bho_IN/UTF-8 \
bn_BD/UTF-8 \
bn_IN/UTF-8 \
@@ -404,6 +404,7 @@ sw_TZ/UTF-8 \
szl_PL/UTF-8 \
ta_IN/UTF-8 \
ta_LK/UTF-8 \
+tcy_IN.UTF-8/UTF-8 \
te_IN/UTF-8 \
tg_TJ.UTF-8/UTF-8 \
tg_TJ/KOI8-T \
@@ -424,7 +425,6 @@ tr_TR/ISO-8859-9 \
ts_ZA/UTF-8 \
tt_RU/UTF-8 \
tt_RU@iqtelif/UTF-8 \
-tu_IN.UTF-8/UTF-8 \
ug_CN/UTF-8 \
uk_UA.UTF-8/UTF-8 \
uk_UA/KOI8-U \