about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2016-02-19 02:27:11 -0500
committerMike Frysinger <vapier@gentoo.org>2016-04-08 18:56:34 -0400
commit20003c49884422da7ffbc459cdeee768a6fee07b (patch)
tree115bacb07d1d6619a26929b064cab1c579c5c26f
parenteb64b6d4571caea5fe39f6427565f849b09c23b6 (diff)
downloadglibc-20003c49884422da7ffbc459cdeee768a6fee07b.tar.gz
glibc-20003c49884422da7ffbc459cdeee768a6fee07b.tar.xz
glibc-20003c49884422da7ffbc459cdeee768a6fee07b.zip
localedata: iw_IL: delete old/deprecated locale [BZ #16137]
From the bug:
Obsolete locale.  The ISO-639 code for Hebrew was changed from 'iw'
to 'he' in 1989, according to Bruno Haible on libc-alpha 2003-09-01.

Reported-by: Chris Leonard <cjlhomeaddress@gmail.com>
-rw-r--r--ChangeLog9
-rw-r--r--benchtests/Makefile2
-rw-r--r--benchtests/bench-strcoll.c2
-rw-r--r--benchtests/strcoll-inputs/filelist#en_US.UTF-83
-rw-r--r--benchtests/strcoll-inputs/lorem_ipsum#he_IL.UTF-8 (renamed from benchtests/strcoll-inputs/lorem_ipsum#iw_IL.UTF-8)0
-rw-r--r--localedata/ChangeLog6
-rw-r--r--localedata/SUPPORTED2
-rw-r--r--localedata/locales/iw_IL168
8 files changed, 18 insertions, 174 deletions
diff --git a/ChangeLog b/ChangeLog
index 541d189cf5..4bf8fc398a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2016-04-08  Mike Frysinger  <vapier@gentoo.org>
+
+	[BZ #16137]
+	* benchtests/Makefile (LOCALES): Change iw_IL to he_IL.
+	* benchtests/bench-strcoll.c (input_files): Likewise.
+	* benchtests/strcoll-inputs/filelist#en_US.UTF-8: Likewise.
+	* benchtests/strcoll-inputs/lorem_ipsum#iw_IL.UTF-8: Rename to ...
+	* benchtests/strcoll-inputs/lorem_ipsum#he_IL.UTF-8: ... here.
+
 2016-04-08  Joseph Myers  <joseph@codesourcery.com>
 
 	[BZ #19929]
diff --git a/benchtests/Makefile b/benchtests/Makefile
index 020ab98374..61077ea9b6 100644
--- a/benchtests/Makefile
+++ b/benchtests/Makefile
@@ -48,7 +48,7 @@ string-benchset-all := $(string-benchset) ${wcsmbs-benchset}
 LOCALES := en_US.UTF-8 tr_TR.UTF-8 cs_CZ.UTF-8 fa_IR.UTF-8 fr_FR.UTF-8 \
 	   ja_JP.UTF-8 si_LK.UTF-8 en_GB.UTF-8 vi_VN.UTF-8 ar_SA.UTF-8 \
 	   da_DK.UTF-8 pl_PL.UTF-8 pt_PT.UTF-8 el_GR.UTF-8 ru_RU.UTF-8 \
-	   iw_IL.UTF-8 is_IS.UTF-8 es_ES.UTF-8 hi_IN.UTF-8 sv_SE.UTF-8 \
+	   he_IL.UTF-8 is_IS.UTF-8 es_ES.UTF-8 hi_IN.UTF-8 sv_SE.UTF-8 \
 	   hu_HU.UTF-8 it_IT.UTF-8 sr_RS.UTF-8 zh_CN.UTF-8
 include ../gen-locales.mk
 
diff --git a/benchtests/bench-strcoll.c b/benchtests/bench-strcoll.c
index 22ae87cf16..6dfc155580 100644
--- a/benchtests/bench-strcoll.c
+++ b/benchtests/bench-strcoll.c
@@ -44,7 +44,7 @@ static const char *const input_files[] = {
   "lorem_ipsum#pt_PT.UTF-8",
   "lorem_ipsum#el_GR.UTF-8",
   "lorem_ipsum#ru_RU.UTF-8",
-  "lorem_ipsum#iw_IL.UTF-8",
+  "lorem_ipsum#he_IL.UTF-8",
   "lorem_ipsum#es_ES.UTF-8",
   "lorem_ipsum#hi_IN.UTF-8",
   "lorem_ipsum#sv_SE.UTF-8",
diff --git a/benchtests/strcoll-inputs/filelist#en_US.UTF-8 b/benchtests/strcoll-inputs/filelist#en_US.UTF-8
index 151dffe77e..b7b38017d8 100644
--- a/benchtests/strcoll-inputs/filelist#en_US.UTF-8
+++ b/benchtests/strcoll-inputs/filelist#en_US.UTF-8
@@ -10525,7 +10525,7 @@ lorem_ipsum_el_GR
 lorem_ipsum_pt_PT
 lorem_ipsum_tr_TR
 en_US
-lorem_ipsum_iw_IL
+lorem_ipsum_he_IL
 lorem_ipsum_ru_RU
 lorem_ipsum_hu_HU
 lorem_ipsum_ja_JP
@@ -11550,7 +11550,6 @@ tr_TR
 iu_CA
 szl_PL
 fr_BE@euro
-iw_IL
 fy_NL
 mn_MN
 cmn_TW
diff --git a/benchtests/strcoll-inputs/lorem_ipsum#iw_IL.UTF-8 b/benchtests/strcoll-inputs/lorem_ipsum#he_IL.UTF-8
index 981a4060a0..981a4060a0 100644
--- a/benchtests/strcoll-inputs/lorem_ipsum#iw_IL.UTF-8
+++ b/benchtests/strcoll-inputs/lorem_ipsum#he_IL.UTF-8
diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index 61382bb884..45cbc1c370 100644
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,3 +1,9 @@
+2016-04-08  Mike Frysinger  <vapier@gentoo.org>
+
+	[BZ #16137]
+	* locales/iw_IL: Deleted.
+	* SUPPORTED: Delete iw_IL lines.
+
 2016-04-08  Mike FABIAN  <mfabian@redhat.com>
 
 	* locales/i18n: Fix typos in tel_int_fmt.
diff --git a/localedata/SUPPORTED b/localedata/SUPPORTED
index f8cf0ebdd1..b1bb310a33 100644
--- a/localedata/SUPPORTED
+++ b/localedata/SUPPORTED
@@ -262,8 +262,6 @@ it_IT.UTF-8/UTF-8 \
 it_IT/ISO-8859-1 \
 it_IT@euro/ISO-8859-15 \
 iu_CA/UTF-8 \
-iw_IL.UTF-8/UTF-8 \
-iw_IL/ISO-8859-8 \
 ja_JP.EUC-JP/EUC-JP \
 ja_JP.UTF-8/UTF-8 \
 ka_GE.UTF-8/UTF-8 \
diff --git a/localedata/locales/iw_IL b/localedata/locales/iw_IL
deleted file mode 100644
index 9baaa636b3..0000000000
--- a/localedata/locales/iw_IL
+++ /dev/null
@@ -1,168 +0,0 @@
-comment_char %
-escape_char /
-
-% This file is part of the GNU C Library and contains locale data.
-% The Free Software Foundation does not claim any copyright interest
-% in the locale data contained in this file.  The foregoing does not
-% affect the license of the GNU C Library as a whole.  It does not
-% exempt you from the conditions of the license if your use would
-% otherwise be governed by that license.
-
-% Hebrew Language Locale for Israel
-% Source: RAP
-% Address: Sankt Jo/rgens Alle 8
-%    DK-1615 Ko/benhavn V, Danmark
-% Contact: Keld Simonsen
-% Email: Keld.Simonsen@dkuug.dk
-% Tel: +45 - 31226543
-% Fax: +45 - 33256543
-% Language: iw
-% Territory: IL
-% Revision: 4.4
-% Date: 1997-03-18
-% Users: general
-% Charset: ISO-8859-8
-%
-% Obsolete locale.  The ISO-639 code for Hebrew was changed from 'iw'
-% to 'he' in 1989, according to Bruno Haible on libc-alpha 2003-09-01.
-
-LC_IDENTIFICATION
-title      "Hebrew locale for Israel"
-source     "RAP"
-address    "Sankt Jo/rgens Alle 8, DK-1615 Ko/benhavn V, Danmark"
-contact    ""
-email      "bug-glibc-locales@gnu.org"
-tel        ""
-fax        ""
-language   "Hebrew"
-territory  "Israel"
-revision   "1.0"
-date       "2000-06-29"
-%
-category  "iw_IL:2000";LC_IDENTIFICATION
-category  "iw_IL:2000";LC_CTYPE
-category  "iw_IL:2000";LC_COLLATE
-category  "iw_IL:2000";LC_TIME
-category  "iw_IL:2000";LC_NUMERIC
-category  "iw_IL:2000";LC_MONETARY
-category  "iw_IL:2000";LC_MESSAGES
-category  "iw_IL:2000";LC_PAPER
-category  "iw_IL:2000";LC_NAME
-category  "iw_IL:2000";LC_ADDRESS
-category  "iw_IL:2000";LC_TELEPHONE
-
-END LC_IDENTIFICATION
-
-LC_CTYPE
-copy "i18n"
-
-translit_start
-include "translit_combining";""
-translit_end
-END LC_CTYPE
-
-LC_COLLATE
-copy "iso14651_t1"
-END LC_COLLATE
-
-LC_MONETARY
-int_curr_symbol   "<U0049><U004C><U0053><U0020>"
-currency_symbol   "<U05E9><U05D7>"
-mon_decimal_point "<U002E>"
-mon_thousands_sep "<U002C>"
-mon_grouping      3;3
-positive_sign     ""
-negative_sign     "<U002D>"
-int_frac_digits   2
-frac_digits       2
-p_cs_precedes     1
-p_sep_by_space    1
-n_cs_precedes     1
-n_sep_by_space    1
-p_sign_posn       2
-n_sign_posn       2
-END LC_MONETARY
-
-LC_NUMERIC
-decimal_point     "<U002E>"
-thousands_sep     "<U002C>"
-grouping          3;3
-END LC_NUMERIC
-
-LC_TIME
-abday   "<U05D0><U0027>";"<U05D1><U0027>";"<U05D2><U0027>";/
-        "<U05D3><U0027>";"<U05D4><U0027>";"<U05D5><U0027>";/
-	"<U05E9><U0027>"
-day     "<U05E8><U05D0><U05E9><U05D5><U05DF>";/
-        "<U05E9><U05E0><U05D9>";/
-        "<U05E9><U05DC><U05D9><U05E9><U05D9>";/
-        "<U05E8><U05D1><U05D9><U05E2><U05D9>";/
-        "<U05D7><U05DE><U05D9><U05E9><U05D9>";/
-        "<U05E9><U05D9><U05E9><U05D9>";/
-        "<U05E9><U05D1><U05EA>"
-mon     "<U05D9><U05E0><U05D5><U05D0><U05E8>";/
-        "<U05E4><U05D1><U05E8><U05D5><U05D0><U05E8>";/
-        "<U05DE><U05E8><U05E5>";/
-        "<U05D0><U05E4><U05E8><U05D9><U05DC>";/
-        "<U05DE><U05D0><U05D9>";/
-        "<U05D9><U05D5><U05E0><U05D9>";/
-        "<U05D9><U05D5><U05DC><U05D9>";/
-        "<U05D0><U05D5><U05D2><U05D5><U05E1><U05D8>";/
-        "<U05E1><U05E4><U05D8><U05DE><U05D1><U05E8>";/
-        "<U05D0><U05D5><U05E7><U05D8><U05D5><U05D1><U05E8>";/
-        "<U05E0><U05D5><U05D1><U05DE><U05D1><U05E8>";/
-        "<U05D3><U05E6><U05DE><U05D1><U05E8>"
-abmon   "<U05D9><U05E0><U05D5>";"<U05E4><U05D1><U05E8>";/
-        "<U05DE><U05E8><U05E5>";"<U05D0><U05E4><U05E8>";/
-        "<U05DE><U05D0><U05D9>";"<U05D9><U05D5><U05E0>";/
-        "<U05D9><U05D5><U05DC>";"<U05D0><U05D5><U05D2>";/
-        "<U05E1><U05E4><U05D8>";"<U05D0><U05D5><U05E7>";/
-        "<U05E0><U05D5><U05D1>";"<U05D3><U05E6><U05DE>"
-d_t_fmt "<U0025><U005A><U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020><U0025><U0059><U0020><U0025><U0062><U0020><U0025><U0064><U0020><U0025><U0061>"
-d_fmt   "<U0025><U0064><U002F><U0025><U006D><U002F><U0025><U0079>"
-t_fmt   "<U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053>"
-am_pm   "<U0041><U004D>";"<U0050><U004D>"
-t_fmt_ampm  "<U0025><U0049><U003A><U0025><U004D><U003A><U0025><U0053><U0020><U0025><U0050>"
-date_fmt       "<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U0065>/
-<U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/
-<U0025><U005A><U0020><U0025><U0059>"
-END LC_TIME
-
-LC_MESSAGES
-yesexpr "<U005E><U005B><U0059><U0079><U05DB><U005D><U002E><U002A>"
-noexpr  "<U005E><U005B><U004E><U006E><U05DC><U005D><U002E><U002A>"
-END LC_MESSAGES
-
-LC_PAPER
-% FIXME
-height   297
-% FIXME
-width    210
-END LC_PAPER
-
-LC_TELEPHONE
-tel_int_fmt    "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025>/
-<U006C>"
-int_prefix     "<U0039><U0037><U0032>"
-END LC_TELEPHONE
-
-LC_MEASUREMENT
-% FIXME
-measurement    1
-END LC_MEASUREMENT
-
-LC_NAME
-name_fmt    "<U0025><U0064><U0025><U0074><U0025><U0067><U0025><U0074>/
-<U0025><U006D><U0025><U0074><U0025><U0066>"
-END LC_NAME
-
-LC_ADDRESS
-postal_fmt    "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/
-<U0025><U0064><U0025><U004E><U0025><U0062><U0025><U004E><U0025><U0073>/
-<U0020><U0025><U0068><U0020><U0025><U0065><U0020><U0025><U0072><U0025>/
-<U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
-<U004E><U0025><U0063><U0025><U004E>"
-country_ab2 "<U0049><U004C>"
-country_ab3 "<U0049><U0053><U0052>"
-country_num 376
-END LC_ADDRESS