about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMike FABIAN <mfabian@redhat.com>2018-01-30 18:04:31 +0100
committerMike FABIAN <mfabian@redhat.com>2018-02-27 16:42:14 +0100
commit1569e551aff088ed48e2694b07045256f3582271 (patch)
tree6d057bb968b5d0d6aaff1c2eafaa5b2f2ac1af89
parent9479b6d5e08eacce06c6ab60abc9b2f4eb8b71e4 (diff)
downloadglibc-1569e551aff088ed48e2694b07045256f3582271.tar.gz
glibc-1569e551aff088ed48e2694b07045256f3582271.tar.xz
glibc-1569e551aff088ed48e2694b07045256f3582271.zip
Necessary changes after updating the iso14651_t1_common file
	* localedata/locales/iso14651_t1_common: Necessary changes
	to make the file downloaded from ISO usable by glibc.
-rw-r--r--ChangeLog5
-rw-r--r--localedata/locales/iso14651_t1_common24
2 files changed, 21 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index e070222eff..64c7417ee7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2018-02-27  Mike FABIAN  <mfabian@redhat.com>
 
+	* localedata/locales/iso14651_t1_common: Necessary changes
+	to make the file downloaded from ISO usable by glibc.
+
+2018-02-27  Mike FABIAN  <mfabian@redhat.com>
+
 	[BZ #14095]
 	* localedata/locales/iso14651_t1_common: Update file to
 	latest version from ISO (ISO14651_2016_TABLE1_en.txt).
diff --git a/localedata/locales/iso14651_t1_common b/localedata/locales/iso14651_t1_common
index 989f3322c0..9546a785fc 100644
--- a/localedata/locales/iso14651_t1_common
+++ b/localedata/locales/iso14651_t1_common
@@ -1,7 +1,14 @@
-% escape_char /
-% comment_char %
+escape_char /
+comment_char %
 
-% LC_COLLATE
+% 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.
+
+LC_COLLATE
 
 % Decomment the lines above to create an
 %   LC_COLLATE definition in the style of ISO/IEC TR 14652:2004.
@@ -21867,10 +21874,11 @@ collating-element <UAABC_AAAF> from "<UAABC><UAAAF>" % collation-element for reo
 
 <SFFFF> % Largest primary weight
 
-
-% order_start forward;forward;forward;forward,position
-
-% order_start forward;backward;forward;forward,position
+ifdef DIACRIT_BACKWARD
+order_start forward;backward;forward;forward,position
+else
+order_start forward;forward;forward;forward,position
+endif
 
 % Decomment the first order_start line to specify directions for each level.
 %   To tailor for French accent handling, instead decomment the second
@@ -52612,7 +52620,7 @@ collating-element <UAABC_AAAF> from "<UAABC><UAAAF>" % collation-element for reo
 
 order_end
 
-% END LC_COLLATE
+END LC_COLLATE
 
 % Decomment the line above to create a 14652-style
 %   LC_COLLATE definition.