This is the mail archive of the glibc-cvs@sourceware.org mailing list for the glibc project.

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

GNU C Library master sources branch master updated. glibc-2.26.9000-876-gfbb5fd0

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".

The branch, master has been updated
       via  fbb5fd03d3189c626a002029e599d7e44e623c1e (commit)
      from  5e56e937c9144e70a16793d2c5aa22d1bd0b2c18 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=fbb5fd03d3189c626a002029e599d7e44e623c1e

commit fbb5fd03d3189c626a002029e599d7e44e623c1e
Author: Mike FABIAN <mfabian@redhat.com>
Date:   Thu Nov 30 15:57:25 2017 +0100

    sr_RS and bs_BA locales: make collation rules the same as for hr_HR [BZ #22534]
    
    	According to CLDR, collation rules for Serbian and Bosnian
    	should be the same as for Croatian.
    
    	[BZ #22534]
    	* localedata/Makefile: Add sr_RS.UTF-8 and bs_BA.UTF-8 to test-input
    	and to the list of locales to be built for testing.
    	* localedata/bs_BA.UTF-8.in: New file (same as hr_HR.UTF-8.in).
    	* localedata/sr_RS.UTF-8.in: New file (same as hr_HR.UTF-8.in).
    	* localedata/locales/bs_BA (LC_COLLATE): Use â??copy "hr_HR"â??.
    	* localedata/locales/sr_RS (LC_COLLATE): Use â??copy "hr_HR"â??.

diff --git a/ChangeLog b/ChangeLog
index 44f46d2..b83024b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,18 @@
 2017-11-30  Mike FABIAN  <mfabian@redhat.com>
 
+	According to CLDR, collation rules for Serbian and Bosnian
+	should be the same as for Croatian.
+
+	[BZ #22534]
+	* localedata/Makefile: Add sr_RS.UTF-8 and bs_BA.UTF-8 to test-input
+	and to the list of locales to be built for testing.
+	* localedata/bs_BA.UTF-8.in: New file (same as hr_HR.UTF-8.in).
+	* localedata/sr_RS.UTF-8.in: New file (same as hr_HR.UTF-8.in).
+	* localedata/locales/bs_BA (LC_COLLATE): Use â??copy "hr_HR"â??.
+	* localedata/locales/sr_RS (LC_COLLATE): Use â??copy "hr_HR"â??.
+
+2017-11-30  Mike FABIAN  <mfabian@redhat.com>
+
 	* localedata/locales/hr_HR (LC_COLLATE): Fix collation
 	to make test case pass.
 	* localedata/hr_HR.UTF-8.in: Add more test strings.
diff --git a/localedata/Makefile b/localedata/Makefile
index a5e7b05..b75fe56 100644
--- a/localedata/Makefile
+++ b/localedata/Makefile
@@ -38,7 +38,8 @@ test-srcs := collate-test xfrm-test tst-fmon tst-rpmatch tst-trans \
 test-input := de_DE.ISO-8859-1 en_US.ISO-8859-1 da_DK.ISO-8859-1 \
 	      hr_HR.ISO-8859-2 sv_SE.ISO-8859-1 tr_TR.UTF-8 fr_FR.UTF-8 \
 	      si_LK.UTF-8 uk_UA.UTF-8 hu_HU.UTF-8 lv_LV.UTF-8 \
-	      pl_PL.UTF-8 cs_CZ.UTF-8 fr_CA.UTF-8 hr_HR.UTF-8
+	      pl_PL.UTF-8 cs_CZ.UTF-8 fr_CA.UTF-8 hr_HR.UTF-8 \
+	      bs_BA.UTF-8 sr_RS.UTF-8
 test-input-data = $(addsuffix .in, $(test-input))
 test-output := $(foreach s, .out .xout, \
 			 $(addsuffix $s, $(basename $(test-input))))
@@ -108,7 +109,7 @@ LOCALES := de_DE.ISO-8859-1 de_DE.UTF-8 en_US.ANSI_X3.4-1968 \
 	   nb_NO.ISO-8859-1 nn_NO.ISO-8859-1 tr_TR.UTF-8 cs_CZ.UTF-8 \
 	   zh_TW.EUC-TW fa_IR.UTF-8 fr_FR.UTF-8 ja_JP.UTF-8 si_LK.UTF-8 \
 	   tr_TR.ISO-8859-9 en_GB.UTF-8 uk_UA.UTF-8 hu_HU.UTF-8 lv_LV.UTF-8 \
-	   pl_PL.UTF-8 fr_CA.UTF-8 hr_HR.UTF-8
+	   pl_PL.UTF-8 fr_CA.UTF-8 hr_HR.UTF-8 bs_BA.UTF-8 sr_RS.UTF-8
 include ../gen-locales.mk
 endif
 
diff --git a/localedata/bs_BA.UTF-8.in b/localedata/bs_BA.UTF-8.in
new file mode 100644
index 0000000..72f04bd
--- /dev/null
+++ b/localedata/bs_BA.UTF-8.in
@@ -0,0 +1,70 @@
+Ceremonijalan
+cvrÄ?iÄ?
+Ä?amac
+Ä?empres
+Ä?akula
+Ä?utjeti
+Dalekovidan
+disharmoniÄ?an
+dza
+Ä?Ž
+dž
+Ç?
+dŽ
+Dž
+Ç?
+DŽ
+Ç?
+dža
+džepni
+Ç?epni
+dŽepni
+Džepni
+Ç?epni
+DŽepni
+Ç?epni
+Džersej
+DŽezistiÄ?ki
+džip
+Ç?ungla
+dŽus
+Ä?avolica
+Ä?uveÄ?
+Edicija
+Lakovjeran
+limunÄ?iÄ?
+lJekovito
+ljenivac
+Ç?enivac
+Ljenivac
+Ç?enivac
+LJenivac
+Ç?enivac
+Ljepljiv
+ljeskov
+Ç?etni
+LJutiti
+MaÄ?iÄ?
+natoÄ?iti
+njedra
+Ç?edra
+nJedra
+Njedra
+Ç?edra
+NJedra
+Ç?edra
+NJegovateljica
+Ç?emaÄ?ki
+Ç?ihalo
+Njisak
+njuškalo
+ObavjeÅ¡tavaÇ?e
+satiriÄ?ar
+Sova
+Å egrtski
+šišmiš
+Tiraža
+zamjetljiv
+ZemÇ?ovlasniÄ?ki
+Žalopojka
+žiÄ?ica
diff --git a/localedata/locales/bs_BA b/localedata/locales/bs_BA
index b9399c6..3b18056 100644
--- a/localedata/locales/bs_BA
+++ b/localedata/locales/bs_BA
@@ -49,97 +49,15 @@ category "i18n:2012";LC_MESSAGES
 END LC_IDENTIFICATION
 
 LC_COLLATE
-copy "iso14651_t1"
-
-% a b c c' c< d dz< d// e f g h i j k l lj m n nj o p
-% q r s s< t u v w x y z z<
-
-collating-symbol  <d-z-sh>
-collating-element <D-Z<> from "<U0044><U017D>"
-collating-element <D-z<> from "<U0044><U017E>"
-collating-element <d-Z<> from "<U0064><U017D>"
-collating-element <d-z<> from "<U0064><U017E>"
-collating-symbol  <l-j-sh>
-collating-element <L-J> from "<U004C><U004A>"
-collating-element <L-j> from "<U004C><U006A>"
-collating-element <l-J> from "<U006C><U004A>"
-collating-element <l-j> from "<U006C><U006A>"
-collating-symbol  <n-j-sh>
-collating-element <N-J> from "<U004E><U004A>"
-collating-element <N-j> from "<U004E><U006A>"
-collating-element <n-J> from "<U006E><U004A>"
-collating-element <n-j> from "<U006E><U006A>"
-collating-symbol <cacute>
-collating-symbol <ccaron>
-collating-symbol <d//>
-collating-symbol <scaron>
-collating-symbol <zcaron>
-
-collating-symbol <CAP-MIN>
-collating-symbol <MIN-CAP>
-
-reorder-after <MIN>
-<MIN-CAP>
-reorder-after <CAP>
-<CAP-MIN>
-
-reorder-after <c>
-<cacute>
-<ccaron>
-<d>
-<d-z-sh>
-<d//>
-reorder-after <l>
-<l-j-sh>
-reorder-after <n>
-<n-j-sh>
-reorder-after <s>
-<scaron>
-reorder-after <z>
-<zcaron>
-
-reorder-after <U0063>
-<U0107>	<cacute>;<PCT>;<MIN>;IGNORE
-<U010D>	<ccaron>;<PCT>;<MIN>;IGNORE
-reorder-after <U0043>
-<U0106>	<cacute>;<PCT>;<CAP>;IGNORE
-<U010C>	<ccaron>;<PCT>;<CAP>;IGNORE
-
-reorder-after <U0064>
-<d-z<>	<d-z-sh>;<PCT>;<MIN>;IGNORE
-<d-Z<>	<d-z-sh>;<PCT>;<MIN-CAP>;IGNORE
-<U0111>	<d//>;<PCT>;<MIN>;IGNORE
-reorder-after <U0044>
-<D-Z<>	<d-z-sh>;<PCT>;<CAP>;IGNORE
-<D-z<>	<d-z-sh>;<PCT>;<CAP-MIN>;IGNORE
-<U0110>	<d//>;<PCT>;<CAP>;IGNORE
-
-reorder-after <U006C>
-<l-j>	<l-j-sh>;<PCT>;<MIN>;IGNORE
-<l-J>	<l-j-sh>;<PCT>;<MIN-CAP>;IGNORE
-reorder-after <U004C>
-<L-J>	<l-j-sh>;<PCT>;<CAP>;IGNORE
-<L-j>	<l-j-sh>;<PCT>;<CAP-MIN>;IGNORE
-
-reorder-after <U006E>
-<n-j>	<n-j-sh>;<PCT>;<MIN>;IGNORE
-<n-J>	<n-j-sh>;<PCT>;<MIN-CAP>;IGNORE
-reorder-after <U004E>
-<N-J>	<n-j-sh>;<PCT>;<CAP>;IGNORE
-<N-j>	<n-j-sh>;<PCT>;<CAP-MIN>;IGNORE
-
-reorder-after <U0073>
-<U0161>	<scaron>;<PCT>;<MIN>;IGNORE
-reorder-after <U0053>
-<U0160>	<scaron>;<PCT>;<CAP>;IGNORE
-
-reorder-after <U007A>
-<U017E>	<zcaron>;<PCT>;<MIN>;IGNORE
-reorder-after <U005A>
-<U017D>	<zcaron>;<PCT>;<CAP>;IGNORE
-
-reorder-end
-
+% According to CLDR, collation rules
+% for Bosnian are the same as for Croatian, see:
+%
+% https://unicode.org/cldr/trac/browser/trunk/common/collation/bs.xml
+%
+% it contains only
+%
+% â??[import hr]â??
+copy "hr_HR"
 END LC_COLLATE
 
 LC_CTYPE
diff --git a/localedata/locales/sr_RS b/localedata/locales/sr_RS
index da31de7..eeddac8 100644
--- a/localedata/locales/sr_RS
+++ b/localedata/locales/sr_RS
@@ -131,108 +131,20 @@ END LC_CTYPE
 
 
 LC_COLLATE
-
-copy "iso14651_t1"
-
-collating-element <D-Z<> from "<U0044><U017D>"
-collating-element <D-z<> from "<U0044><U017E>"
-collating-element <d-Z<> from "<U0064><U017D>"
-collating-element <d-z<> from "<U0064><U017E>"
-
-collating-element <L-J> from "<U004C><U004A>"
-collating-element <L-j> from "<U004C><U006A>"
-collating-element <l-J> from "<U006C><U004A>"
-collating-element <l-j> from "<U006C><U006A>"
-
-collating-element <N-J> from "<U004E><U004A>"
-collating-element <N-j> from "<U004E><U006A>"
-collating-element <n-J> from "<U006E><U004A>"
-collating-element <n-j> from "<U006E><U006A>"
-
-collating-symbol  <d-z-sh>
-collating-symbol  <l-j-sh>
-collating-symbol  <n-j-sh>
-
-collating-symbol <cacute>
-collating-symbol <ccaron>
-collating-symbol <d//>
-collating-symbol <scaron>
-collating-symbol <zcaron>
-
-collating-symbol <CAP-MIN>
-collating-symbol <MIN-CAP>
-
-reorder-after <MIN>
-<MIN-CAP>
-reorder-after <CAP>
-<CAP-MIN>
-
-reorder-after <c>
-<cacute>
-<ccaron>
-<d>
-<d-z-sh>
-<d//>
-reorder-after <l>
-<l-j-sh>
-reorder-after <n>
-<n-j-sh>
-reorder-after <s>
-<scaron>
-reorder-after <z>
-<zcaron>
-
-reorder-after <U0063>
-<U0107>	<cacute>;<PCT>;<MIN>;IGNORE
-<U010D>	<ccaron>;<PCT>;<MIN>;IGNORE
-reorder-after <U0043>
-<U0106>	<cacute>;<PCT>;<CAP>;IGNORE
-<U010C>	<ccaron>;<PCT>;<CAP>;IGNORE
-
-reorder-after <U0064>
-<d-z<>	<d-z-sh>;<PCT>;<MIN>;IGNORE
-<U01C6>	<d-z-sh>;<PCT>;<MIN>;IGNORE
-<d-Z<>	<d-z-sh>;<PCT>;<MIN-CAP>;IGNORE
-<U0111>	<d//>;<PCT>;<MIN>;IGNORE
-reorder-after <U0044>
-<D-Z<>	<d-z-sh>;<PCT>;<CAP>;IGNORE
-<U01C4>	<d-z-sh>;<PCT>;<CAP>;IGNORE
-<D-z<>	<d-z-sh>;<PCT>;<CAP-MIN>;IGNORE
-<U01C5>	<d-z-sh>;<PCT>;<CAP-MIN>;IGNORE
-<U0110>	<d//>;<PCT>;<CAP>;IGNORE
-
-reorder-after <U006C>
-<l-j>	<l-j-sh>;<PCT>;<MIN>;IGNORE
-<U01C9>	<l-j-sh>;<PCT>;<MIN>;IGNORE
-<l-J>	<l-j-sh>;<PCT>;<MIN-CAP>;IGNORE
-reorder-after <U004C>
-<L-J>	<l-j-sh>;<PCT>;<CAP>;IGNORE
-<U01C7>	<l-j-sh>;<PCT>;<CAP>;IGNORE
-<L-j>	<l-j-sh>;<PCT>;<CAP-MIN>;IGNORE
-<U01C8>	<l-j-sh>;<PCT>;<CAP-MIN>;IGNORE
-
-reorder-after <U006E>
-<n-j>	<n-j-sh>;<PCT>;<MIN>;IGNORE
-<U01CC>	<n-j-sh>;<PCT>;<MIN>;IGNORE
-<n-J>	<n-j-sh>;<PCT>;<MIN-CAP>;IGNORE
-reorder-after <U004E>
-<N-J>	<n-j-sh>;<PCT>;<CAP>;IGNORE
-<U01CA>	<n-j-sh>;<PCT>;<CAP>;IGNORE
-<N-j>	<n-j-sh>;<PCT>;<CAP-MIN>;IGNORE
-<U01CB>	<n-j-sh>;<PCT>;<CAP-MIN>;IGNORE
-
-reorder-after <U0073>
-<U0161>	<scaron>;<PCT>;<MIN>;IGNORE
-reorder-after <U0053>
-<U0160>	<scaron>;<PCT>;<CAP>;IGNORE
-
-reorder-after <U007A>
-<U017E>	<zcaron>;<PCT>;<MIN>;IGNORE
-reorder-after <U005A>
-<U017D>	<zcaron>;<PCT>;<CAP>;IGNORE
-
-reorder-end
-
+% According to CLDR, collation rules
+% for Bosnian are the same as for Serbian, see:
+%
+% https://unicode.org/cldr/trac/browser/trunk/common/collation/sr_Latn.xml
+%
+% it contains only
+%
+% â??[import hr]â??
+%
+% and the cyrillic version of the Serbian locale has no special collation
+% rules at all in CLDR:
+%
+% https://unicode.org/cldr/trac/browser/trunk/common/collation/sr.xml
+copy "hr_HR"
 END LC_COLLATE
 
 LC_MONETARY
diff --git a/localedata/sr_RS.UTF-8.in b/localedata/sr_RS.UTF-8.in
new file mode 100644
index 0000000..72f04bd
--- /dev/null
+++ b/localedata/sr_RS.UTF-8.in
@@ -0,0 +1,70 @@
+Ceremonijalan
+cvrÄ?iÄ?
+Ä?amac
+Ä?empres
+Ä?akula
+Ä?utjeti
+Dalekovidan
+disharmoniÄ?an
+dza
+Ä?Ž
+dž
+Ç?
+dŽ
+Dž
+Ç?
+DŽ
+Ç?
+dža
+džepni
+Ç?epni
+dŽepni
+Džepni
+Ç?epni
+DŽepni
+Ç?epni
+Džersej
+DŽezistiÄ?ki
+džip
+Ç?ungla
+dŽus
+Ä?avolica
+Ä?uveÄ?
+Edicija
+Lakovjeran
+limunÄ?iÄ?
+lJekovito
+ljenivac
+Ç?enivac
+Ljenivac
+Ç?enivac
+LJenivac
+Ç?enivac
+Ljepljiv
+ljeskov
+Ç?etni
+LJutiti
+MaÄ?iÄ?
+natoÄ?iti
+njedra
+Ç?edra
+nJedra
+Njedra
+Ç?edra
+NJedra
+Ç?edra
+NJegovateljica
+Ç?emaÄ?ki
+Ç?ihalo
+Njisak
+njuškalo
+ObavjeÅ¡tavaÇ?e
+satiriÄ?ar
+Sova
+Å egrtski
+šišmiš
+Tiraža
+zamjetljiv
+ZemÇ?ovlasniÄ?ki
+Žalopojka
+žiÄ?ica

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                                     |   13 +++
 localedata/Makefile                           |    5 +-
 localedata/{hr_HR.UTF-8.in => bs_BA.UTF-8.in} |    0
 localedata/locales/bs_BA                      |  100 ++-------------------
 localedata/locales/sr_RS                      |  116 +++----------------------
 localedata/{hr_HR.UTF-8.in => sr_RS.UTF-8.in} |    0
 6 files changed, 39 insertions(+), 195 deletions(-)
 copy localedata/{hr_HR.UTF-8.in => bs_BA.UTF-8.in} (100%)
 copy localedata/{hr_HR.UTF-8.in => sr_RS.UTF-8.in} (100%)


hooks/post-receive
-- 
GNU C Library master sources
Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]