[Patch 6/13] [BZ #14095] update collation data from Unicode / ISO 14651

[Patch 6/13] [BZ #14095] update collation data from Unicode / ISO 14651

[Mike FABIAN]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: 0006-Collation-order-of-.-and-space-has-changed-in-new-is.patch --]
[-- Type: text/x-patch, Size: 2898 bytes --]

From 91851115d84d488e2da8c34cae1053a72c439614 Mon Sep 17 00:00:00 2001
From: Mike FABIAN <mfabian@redhat.com>
Date: Wed, 13 Dec 2017 14:39:54 +0100
Subject: [PATCH 06/13] Collation order of @-. and space has changed in new
 iso14651_t1_common file, adapt test files

	* localedata/da_DK.ISO-8859-1.in: In the new iso14651_t1_common file
        downloaded from ISO, the collation order of @-. and space has changed.
        Therefore, this test file needed to be adapted.
	* localedata/fr_CA.UTF-8.in: Likewise.
	* localedata/fr_FR.UTF-8.in: Likewise.
	* localedata/uk_UA.UTF-8.in: Likewise.
---
 localedata/da_DK.ISO-8859-1.in | 4 ++--
 localedata/fr_CA.UTF-8.in      | 9 +++++----
 localedata/fr_FR.UTF-8.in      | 9 +++++----
 localedata/uk_UA.UTF-8.in      | 4 ++--
 4 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/localedata/da_DK.ISO-8859-1.in b/localedata/da_DK.ISO-8859-1.in
index e9d2620d5d..9a0e7bc04d 100644
--- a/localedata/da_DK.ISO-8859-1.in
+++ b/localedata/da_DK.ISO-8859-1.in
@@ -2,8 +2,8 @@ A
 ANDRE
 ANDRÉ
 ANDREAS
-AS
 A/S
+AS
 CA
 ÇA
 CB
@@ -12,8 +12,8 @@ DA
 ÐA
 DB
 ÐC
-DSB
 D.S.B.
+DSB
 DSC
 EKSTRA-ARBEJDE
 EKSTRABUD
diff --git a/localedata/fr_CA.UTF-8.in b/localedata/fr_CA.UTF-8.in
index 1c05d69f5a..c98a8e7fb8 100644
--- a/localedata/fr_CA.UTF-8.in
+++ b/localedata/fr_CA.UTF-8.in
@@ -4,8 +4,8 @@
 Aalborg
 aide
 aïeul
-air
 @@@air
+air
 air@@@
 Ã…lborg
 août
@@ -22,10 +22,10 @@ casanier
 cølibat
 colon
 côlon
-COOP
 CO-OP
-coop
+COOP
 co-op
+coop
 Copenhagen
 COTE
 cote
@@ -58,8 +58,9 @@ lésé
 L'Haÿ-les-Roses
 MÂCON
 maçon
-McArthur
 Mc Arthur
+McArthur
+Mc Arthurb
 Mc Mahon
 MODÈLE
 modelé
diff --git a/localedata/fr_FR.UTF-8.in b/localedata/fr_FR.UTF-8.in
index 070eb4dc0d..f719dc2210 100644
--- a/localedata/fr_FR.UTF-8.in
+++ b/localedata/fr_FR.UTF-8.in
@@ -4,8 +4,8 @@
 Aalborg
 aide
 aïeul
-air
 @@@air
+air
 air@@@
 Ã…lborg
 août
@@ -22,10 +22,10 @@ casanier
 cølibat
 colon
 côlon
-coop
 co-op
-COOP
+coop
 CO-OP
+COOP
 Copenhagen
 cote
 COTE
@@ -58,8 +58,9 @@ lèse
 L'Haÿ-les-Roses
 maçon
 MÂCON
-McArthur
 Mc Arthur
+McArthur
+Mc Arthurb
 Mc Mahon
 modelé
 MODÈLE
diff --git a/localedata/uk_UA.UTF-8.in b/localedata/uk_UA.UTF-8.in
index ff4d284d61..14ee847d9c 100644
--- a/localedata/uk_UA.UTF-8.in
+++ b/localedata/uk_UA.UTF-8.in
@@ -10,11 +10,11 @@
 ґрати
 ебонітовий
 експорт
-експосол
 екс-посол
+експосол
 експоцентр
-експрацівник
 екс-працівник
+експрацівник
 еластичність
 електрика
 ельбор
-- 
2.14.3