Message ID | 1437124619-16257-1-git-send-email-raj.khem@gmail.com |
---|---|
State | New |
Headers | show |
looks obvious enough -mike
On 07/18/2015 10:02 PM, Mike Frysinger wrote: > looks obvious enough > -mike > Khem, Are you able to check this in? If not, please work with Mike or someone else to checkin for 2.22 right now. Cheers, Carlos.
> On Jul 18, 2015, at 7:02 PM, Mike Frysinger <vapier@gentoo.org> wrote: > > looks obvious enough > -mike Mike can you help committing it for me please, my last email bounced so resending it.
On 20 Jul 2015 19:04, Khem Raj wrote: > > On Jul 18, 2015, at 7:02 PM, Mike Frysinger wrote: > > looks obvious enough > > Mike can you help committing it for me please, my last email bounced so resending it. i thought you had commit access. at any rate, i fixed up the ChangeLog entries and pushed it to master. -mike
diff --git a/ChangeLog b/ChangeLog index 1265017..c10e05a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2015-07-16 Khem Raj <raj.khem@gmail.com> + * benchtests/strcoll-inputs/filelist#en_US.UTF-8: Adjust for rename + of tu_IN and bh_IN. + 2015-07-16 David S. Miller <davem@davemloft.net> * sysdeps/sparc/fpu/libm-test-ulps: Regenerated. diff --git a/benchtests/strcoll-inputs/filelist#en_US.UTF-8 b/benchtests/strcoll-inputs/filelist#en_US.UTF-8 index c9f1427..151dffe 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 8a10346..36c44f6 100644 --- a/localedata/ChangeLog +++ b/localedata/ChangeLog @@ -1,8 +1,14 @@ +2015-07-16 Khem Raj <raj.khem@gmail.com> + + [BZ #17475] + * SUPPORTED: Rename tu_IN to tcy_IN and + bh_IN to bhb_IN. + 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 9bf2a4f..8ca023e 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 \
Signed-off-by: Khem Raj <raj.khem@gmail.com> --- ChangeLog | 4 ++++ benchtests/strcoll-inputs/filelist#en_US.UTF-8 | 4 ++-- localedata/ChangeLog | 10 ++++++++-- localedata/SUPPORTED | 4 ++-- 4 files changed, 16 insertions(+), 6 deletions(-)