From 3b8dfc621bfd320c924a3cd597086d3473da1cf4 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Thu, 22 Dec 2011 21:23:33 -0500 Subject: [PATCH] Fix fi_FI collation reordering --- NEWS | 8 ++++---- localedata/ChangeLog | 3 +++ localedata/locales/fi_FI | 45 +++++++++++++++++++++++++-------------------- 3 files changed, 32 insertions(+), 24 deletions(-) diff --git a/NEWS b/NEWS index fe57b58..a66546e 100644 --- a/NEWS +++ b/NEWS @@ -11,10 +11,10 @@ Version 2.15 6779, 6783, 9696, 10103, 10709, 11589, 12403, 12847, 12868, 12852, 12874, 12885, 12892, 12907, 12922, 12935, 13007, 13021, 13067, 13068, 13090, - 13092, 13114, 13118, 13123, 13134, 13138, 13147, 13150, 13166, 13179, - 13185, 13189, 13192, 13268, 13276, 13282, 13291, 13305, 13328, 13335, - 13337, 13344, 13358, 13367, 13413, 13416, 13423, 13439, 13446, 13472, - 13484, 13506, 13515, 13523, 13524, 13538, 13540 + 13092, 13096, 13114, 13118, 13123, 13134, 13138, 13147, 13150, 13166, + 13179, 13185, 13189, 13192, 13268, 13276, 13282, 13291, 13305, 13328, + 13335, 13337, 13344, 13358, 13367, 13413, 13416, 13423, 13439, 13446, + 13472, 13484, 13506, 13515, 13523, 13524, 13538, 13540 * New program pldd to list loaded object of a process Implemented by Ulrich Drepper. diff --git a/localedata/ChangeLog b/localedata/ChangeLog index 7e3c1ae..743bfdb 100644 --- a/localedata/ChangeLog +++ b/localedata/ChangeLog @@ -1,5 +1,8 @@ 2011-12-22 Ulrich Drepper + [BZ #13096] + * locales/fi_FI: Fix collation reordering rules. + [BZ #13189] * SUPPORTED (SUPPORTED-LOCALES): Add ur_IN entry. diff --git a/localedata/locales/fi_FI b/localedata/locales/fi_FI index c360487..acc9ce6 100644 --- a/localedata/locales/fi_FI +++ b/localedata/locales/fi_FI @@ -63,60 +63,65 @@ reorder-after -reorder-after +reorder-after ;;;IGNORE - ;;;IGNORE ;;;IGNORE - ;;;IGNORE ;;;IGNORE - ;;;IGNORE ;;;IGNORE - ;;;IGNORE ;;;IGNORE - ;;;IGNORE ;;;IGNORE - ;;;IGNORE ;;;IGNORE - ;;;IGNORE ;;;IGNORE - ;;;IGNORE ;;;IGNORE - ;;;IGNORE ;;;IGNORE +reorder-after + ;;;IGNORE + ;;;IGNORE + ;;;IGNORE + ;;;IGNORE + ;;;IGNORE + ;;;IGNORE + ;;;IGNORE + ;;;IGNORE + ;;;IGNORE ;;;IGNORE -reorder-after +reorder-after ;;; - ;;; ;;; - ;;; ;;; - ;;; ;;; - ;;; ;;; - ;;; ;;; - ;;; ;;; - ;;; ;;; +reorder-after + ;;; + ;;; + ;;; + ;;; + ;;; + ;;; + ;;; ;;; reorder-after ;;;IGNORE +reorder-after ;;;IGNORE % Present in iso14651_t1, but these definitions seem to have been % removed from latest iso14651 tables. -reorder-after +reorder-after "";"";"";IGNORE +reorder-after "";"";"";IGNORE reorder-after ;;;IGNORE - ;;;IGNORE ;;;IGNORE +reorder-after + ;;;IGNORE ;;;IGNORE reorder-end -- 2.7.4