r1621 - in glibc-package/trunk/debian: . patches patches/localedata
Author: barbier
Date: 2006-06-05 23:02:25 +0000 (Mon, 05 Jun 2006)
New Revision: 1621
Added:
glibc-package/trunk/debian/patches/localedata/locale-se_NO.diff
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/localedata/locale-csb_PL.diff
glibc-package/trunk/debian/patches/localedata/locale-ro_RO.diff
glibc-package/trunk/debian/patches/localedata/tailor-iso14651_t1.diff
glibc-package/trunk/debian/patches/series
Log:
* debian/patches/localedata/tailor-iso14651_t1.diff: Fix several collation
rules, which could cause errors in regular expressions with character
ranges, in particular with et_EE locale. (Closes: #362514)
* debian/patches/localedata/locale-csb_PL.diff
* debian/patches/localedata/locale-ro_RO.diff
* debian/patches/localedata/locale-se_NO.diff: Apply similar fixes.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2006-06-05 22:39:01 UTC (rev 1620)
+++ glibc-package/trunk/debian/changelog 2006-06-05 23:02:25 UTC (rev 1621)
@@ -16,6 +16,14 @@
* debhelper.in/libnss-dns-udeb.install, debhelper.in/libnss-files-udeb.install:
fix the installation path. (Closes: #370523)
+ [ Denis Barbier ]
+ * debian/patches/localedata/tailor-iso14651_t1.diff: Fix several collation
+ rules, which could cause errors in regular expressions with character
+ ranges, in particular with et_EE locale. (Closes: #362514)
+ * debian/patches/localedata/locale-csb_PL.diff
+ * debian/patches/localedata/locale-ro_RO.diff
+ * debian/patches/localedata/locale-se_NO.diff: Apply similar fixes.
+
-- Aurelien Jarno <aurel32@debian.org> Mon, 5 Jun 2006 18:07:13 +0200
glibc (2.3.6-13) unstable; urgency=low
Modified: glibc-package/trunk/debian/patches/localedata/locale-csb_PL.diff
===================================================================
--- glibc-package/trunk/debian/patches/localedata/locale-csb_PL.diff 2006-06-05 22:39:01 UTC (rev 1620)
+++ glibc-package/trunk/debian/patches/localedata/locale-csb_PL.diff 2006-06-05 23:02:25 UTC (rev 1621)
@@ -7,11 +7,11 @@
# DP: Detailed status: Modified collation rules to tailor iso14651_t1
# DP: Date: 2006-01-18
-Index: glibc-2.3.5/localedata/locales/csb_PL
+Index: glibc-2.3.6/localedata/locales/csb_PL
===================================================================
--- /dev/null
-+++ glibc-2.3.5/localedata/locales/csb_PL
-@@ -0,0 +1,206 @@
++++ glibc-2.3.6/localedata/locales/csb_PL
+@@ -0,0 +1,213 @@
+comment_char %
+escape_char /
+%
@@ -94,38 +94,45 @@
+
+reorder-after <U0061>
+<U0105> <aogonek>;<BAS>;<MIN>;IGNORE
++<U00E3> <atilde>;<BAS>;<MIN>;IGNORE
++reorder-after <U0041>
+<U0104> <aogonek>;<BAS>;<CAP>;IGNORE
-+<U00E3> <atilde>;<BAS>;<MIN>;IGNORE
+<U00C3> <atilde>;<BAS>;<CAP>;IGNORE
+
+reorder-after <U0065>
+<U00E9> <eacute>;<BAS>;<MIN>;IGNORE
++<U00EB> <ediaeresis>;<BAS>;<MIN>;IGNORE
++reorder-after <U0045>
+<U00C9> <eacute>;<BAS>;<CAP>;IGNORE
-+<U00EB> <ediaeresis>;<BAS>;<MIN>;IGNORE
+<U00CB> <ediaeresis>;<BAS>;<CAP>;IGNORE
+
+reorder-after <U006C>
+<U0142> <lstroke>;<BAS>;<MIN>;IGNORE
++reorder-after <U004C>
+<U0141> <lstroke>;<BAS>;<CAP>;IGNORE
+
+reorder-after <U006E>
+<U0144> <nacute>;<BAS>;<MIN>;IGNORE
++reorder-after <U004E>
+<U0143> <nacute>;<BAS>;<CAP>;IGNORE
+
+reorder-after <U006F>
+<U00F2> <ograve>;<BAS>;<MIN>;IGNORE
++<U00F3> <oacute>;<BAS>;<MIN>;IGNORE
++<U00F4> <ocirc>;<BAS>;<MIN>;IGNORE
++reorder-after <U004F>
+<U00D2> <ograve>;<BAS>;<CAP>;IGNORE
-+<U00F3> <oacute>;<BAS>;<MIN>;IGNORE
+<U00D3> <oacute>;<BAS>;<CAP>;IGNORE
-+<U00F4> <ocirc>;<BAS>;<MIN>;IGNORE
+<U00D4> <ocirc>;<BAS>;<CAP>;IGNORE
+
+reorder-after <U0075>
+<U00F9> <ugrave>;<BAS>;<MIN>;IGNORE
++reorder-after <U0055>
+<U00D9> <ugrave>;<BAS>;<CAP>;IGNORE
+
+reorder-after <U007A>
+<U017C> <zdot>;<BAS>;<MIN>;IGNORE
++reorder-after <U005A>
+<U017B> <zdot>;<BAS>;<CAP>;IGNORE
+
+reorder-end
@@ -218,10 +225,10 @@
+LC_MEASUREMENT
+copy "pl_PL"
+END LC_MEASUREMENT
-Index: glibc-2.3.5/localedata/SUPPORTED
+Index: glibc-2.3.6/localedata/SUPPORTED
===================================================================
---- glibc-2.3.5.orig/localedata/SUPPORTED
-+++ glibc-2.3.5/localedata/SUPPORTED
+--- glibc-2.3.6.orig/localedata/SUPPORTED
++++ glibc-2.3.6/localedata/SUPPORTED
@@ -71,6 +71,7 @@
ca_IT/ISO-8859-15 \
cs_CZ.UTF-8/UTF-8 \
Modified: glibc-package/trunk/debian/patches/localedata/locale-ro_RO.diff
===================================================================
--- glibc-package/trunk/debian/patches/localedata/locale-ro_RO.diff 2006-06-05 22:39:01 UTC (rev 1620)
+++ glibc-package/trunk/debian/patches/localedata/locale-ro_RO.diff 2006-06-05 23:02:25 UTC (rev 1621)
@@ -1,408 +1,426 @@
-# All lines beginning with `# DP:' are a description of the patch.
-# DP: Description: Fix Romanian locale
-# DP: Dpatch author: Eddy Petrisor <eddy.petrisor@gmail.com>
-# DP: Patch author: Eddy Petrisor <eddy.petrisor@gmail.com>
-# DP: Upstream status: BZ2125
-# DP: Date: 2006-02-24
-
-2006-01-07 Eddy Petrisor <eddy.petrisor@gmail.com>
-
- * locales/ro_RO: Correct the sorting order of the letters a
- circumflex and a with breve according to the Romanian alphabet.
- * locales/ro_RO: Do not use capital A with breve within day names
- * locales/ro_RO: Use Romanian post-92 writing rules within day
- * locales/ro_RO: After denomination starting with the 1st of July 2005,
- int'l currency symbol is RON (1 RON = 10000 ROL);
- see http://publications.eu.int/code/en/en-5000700.htm;
- * locales/ro_RO: groupping sign for thousands is "."; group of 3
- * locales/ro_RO: short date format is %d.%m.%Y for RO
- * locales/ro_RO: placed year before time in date_fmt
- * locales/ro_RO: replaced %Z with %z in date formats because %Z is not
- used nor widely known in Romania, and Romania uses daylight saving and
- the difference is more obvious this way
- * locales/ro_RO: changed abday for Saturday as i> looks bad and is
- incorrect according to post-92 rules
- * locales/ro_RO: do not capitalize months and days as it is not correct
- in Romanian
- * locales/ro_RO: A4 is the prefered paper type; metric system is used
- (removed FIXMEs)
- * locales/ro_RO: added country_name, country_car, lang_name and lang_ab
- * locales/ro_RO: added name_mr, name_mrs, name_miss (name_ms omitted as
- there is no such proper form in Romanian)
- * locales/ro_RO: added explanation related to the cedilla/comma issue and
- the reson why the transliteration is a good idea
- * locales/ro_RO: changed default encoding to UTF-8 - this is the only
- encoding that supports all Romanian specific symbols (see encoding table
- in Debian BTS, #119528 and the corresponding comments in #347173)
- * locales/ro_RO: Corrected the name format (salutation abbreviation was
- omitted)
- * locales/ro_RO: Corrected postal_fmt (See address examples from
- Romanian Ministries' sites in Debian BTS #347173)
- * locales/ro_RO: first_weekday and first_workday are both Monday
- * locales/ro_RO: added terminology and bibliographic codes for RO
- reference: http://www.loc.gov/standards/iso639-2/langcodes.html#qr
- * locales/ro_RO: added isbn code
- * locales/ro_RO: added postal code - RO (not 100% sure)
-
---- localedata/locales/ro_RO.orig Thu Feb 23 14:19:22 2006
-+++ localedata/locales/ro_RO Fri Feb 24 00:14:36 2006
-@@ -15,9 +15,13 @@
- % Date: 1996-10-15
- % Application: general
- % Users: general
--% Charset: ISO-8859-2
-+% Charset: UTF-8
- % Distribution and use is free, also
- % for commercial purposes.
-+%
-+% Corrections by:
-+% 2006-01-07
-+% Eddy Petrisor <eddy.petrisor@gmail.com>
-
- LC_IDENTIFICATION
- title "Romanian locale for Romania"
-@@ -51,10 +55,11 @@
- % Copy the template from ISO/IEC 14651
- copy "iso14651_t1"
-
--% a a> a( b c d e f g h i i> j k l m n o p q r s s, t t, u v w x y z
-+% The modern Romanian alphabet has 31 letters, ordered as below:
-+% a a( a> b c d e f g h i i> j k l m n o p q r s s, t t, u v w x y z
-
--collating-symbol <a/>>
- collating-symbol <a(>
-+collating-symbol <a/>>
- collating-symbol <i/>>
- collating-symbol <s,>
- collating-symbol <t,>
-@@ -64,8 +69,8 @@
- <BRE>
-
- reorder-after <a>
--<a/>>
- <a(>
-+<a/>>
- reorder-after <i>
- <i/>>
- reorder-after <s>
-@@ -74,11 +79,11 @@
- <t,>
-
- reorder-after <U0061>
--<U00E2> <a/>>;<CIR>;<MIN>;IGNORE
- <U0103> <a(>;<BRE>;<MIN>;IGNORE
-+<U00E2> <a/>>;<CIR>;<MIN>;IGNORE
- reorder-after <U0041>
--<U00C2> <a/>>;<CIR>;<CAP>;IGNORE
- <U0102> <a(>;<BRE>;<CAP>;IGNORE
-+<U00C2> <a/>>;<CIR>;<CAP>;IGNORE
-
- reorder-after <U0069>
- <U00EE> <i/>>;<CIR>;<MIN>;IGNORE
-@@ -103,9 +108,22 @@
-
- END LC_COLLATE
-
-+
-+
- LC_CTYPE
- copy "i18n"
-
-+%
-+% Transliteration is _currently_ a good idea as most fonts/applications do not
-+% have the correct diacritics for "t comma bellow" (U021A, U021B) and
-+% "s comma bellow" (U0218, U0219). Thus we currently use and compromise with
-+% "t cedilla" (U0162, U0163) - which, actually, does not belong to any
-+% language - and "s cedilla" (U015E, U015F) - which is _not_ correct for
-+% Romanian, but is correct for Turkish.
-+%
-+% This issue should be fixed in the future, when enough font and application
-+% support will be provided in current operating systems.
-+%
- translit_start
- include "translit_combining";""
-
-@@ -124,19 +142,31 @@
- translit_end
- END LC_CTYPE
-
-+
-+
- LC_MESSAGES
- yesexpr "<U005E><U005B><U0044><U0064><U0059><U0079><U005D><U002E><U002A>"
- noexpr "<U005E><U005B><U006E><U004E><U005D><U002E><U002A>"
- END LC_MESSAGES
-
-+
- LC_MONETARY
--int_curr_symbol "<U0052><U004F><U004C><U0020>"
-+% Since the 1st of July 2005, the new currency is the ROmanian New leu
-+% the symbol is RON and 1 RON = 10000 ROL (old ROmanian Leu)...
-+int_curr_symbol "<U0052><U004F><U004E><U0020>"
-+% but representing counted coins is made in the same way as before.
- currency_symbol "<U004C><U0065><U0069>"
-+% decimal point is comma
- mon_decimal_point "<U002C>"
-+% the separation of digits is made in groups of three
-+% and the separator between the groups is the full stop (dot)
- mon_thousands_sep "<U002E>"
- mon_grouping 3;3
-+% the positive sign is not usualy represented
- positive_sign ""
-+% while the negative one is
- negative_sign "<U002D>"
-+% usualy one will display only two digits after the decimal point
- int_frac_digits 2
- frac_digits 2
- p_cs_precedes 1
-@@ -147,80 +177,213 @@
- n_sign_posn 1
- END LC_MONETARY
-
-+
- LC_NUMERIC
-+% same rules as for monetary apply for regular figures:
-+% decimal point is comma
- decimal_point "<U002C>"
--thousands_sep ""
--grouping 0;0
-+% and the separator between groups is full stop
-+thousands_sep "<U002E>"
-+% the separation of figures is made in groups of three
-+grouping 3;3
- END LC_NUMERIC
-
-+
- LC_TIME
-+% abbreviated day names are (starting from Monday): Lu Ma Mi Jo Vi Sb Du
- abday "<U0044><U0075>";"<U004C><U0075>";"<U004D><U0061>";"<U004D><U0069>";/
-- "<U004A><U006F>";"<U0056><U0069>";"<U0053><U00EE>"
--day "<U0044><U0075><U006D><U0069><U006E><U0069><U0063><U0102>";/
-- "<U004C><U0075><U006E><U0069>";/
-- "<U004D><U0061><U0072><U0163><U0069>";/
-- "<U004D><U0069><U0065><U0072><U0063><U0075><U0072><U0069>";/
-- "<U004A><U006F><U0069>";/
-- "<U0056><U0069><U006E><U0065><U0072><U0069>";/
-- "<U0053><U00EE><U006D><U0062><U0102><U0074><U0102>"
-+ "<U004A><U006F>";"<U0056><U0069>";"<U0053><U0062>"
-+%
-+% Because in 1992 the Romanian Academy stated that within words the
-+% writing of the letter i> (i circumflex - U00EE) should be replaced
-+% by a> (acircumflex - U00E2), we use the post92 writing.
-+% Note: The actual rule is more complex, but the case which applies for
-+% Satruday is covered by the exposed explanation above.
-+%
-+% Day names are not capitalized:
-+% duminic<abreve>, luni, mar<tcomma>i,
-+% miercuri, joi, vineri,
-+% s<acircumflex>mb<abreve>t<abreve>
-+%
-+% Note that Tuesday Romanian day should be using t comma, not t cedilla,
-+% but due to the low availability of the glyph (U021B) in fonts we use
-+% the "so called t cedilla"
-+day "<U0064><U0075><U006D><U0069><U006E><U0069><U0063><U0103>";/
-+ "<U006C><U0075><U006E><U0069>";/
-+ "<U006D><U0061><U0072><U0163><U0069>";/
-+ "<U006D><U0069><U0065><U0072><U0063><U0075><U0072><U0069>";/
-+ "<U006A><U006F><U0069>";/
-+ "<U0076><U0069><U006E><U0065><U0072><U0069>";/
-+ "<U0073><U00E2><U006D><U0062><U0103><U0074><U0103>"
-+%
-+% All month abbreviations are composed of the first three letters of the full
-+% Romanian names of the months, except for November, whose abbreviation comes
-+% from the Latin month name, thus the abbreviation is "nov"
-+%
-+% Month names are not capitalized:
-+% ian feb mar apr mai iun iul aug sep oct nov dec
- abmon "<U0069><U0061><U006E>";"<U0066><U0065><U0062>";/
- "<U006D><U0061><U0072>";"<U0061><U0070><U0072>";/
- "<U006D><U0061><U0069>";"<U0069><U0075><U006E>";/
- "<U0069><U0075><U006C>";"<U0061><U0075><U0067>";/
- "<U0073><U0065><U0070>";"<U006F><U0063><U0074>";/
- "<U006E><U006F><U0076>";"<U0064><U0065><U0063>"
--mon "<U0049><U0061><U006E><U0075><U0061><U0072><U0069><U0065>";/
-- "<U0046><U0065><U0062><U0072><U0075><U0061><U0072><U0069><U0065>";/
-- "<U004D><U0061><U0072><U0074><U0069><U0065>";/
-- "<U0041><U0070><U0072><U0069><U006C><U0069><U0065>";/
-- "<U004D><U0061><U0069>";/
-- "<U0049><U0075><U006E><U0069><U0065>";/
-- "<U0049><U0075><U006C><U0069><U0065>";/
-- "<U0041><U0075><U0067><U0075><U0073><U0074>";/
-- "<U0053><U0065><U0070><U0074><U0065><U006D><U0062><U0072><U0069><U0065>";/
-- "<U004F><U0063><U0074><U006F><U006D><U0062><U0072><U0069><U0065>";/
-- "<U004E><U006F><U0069><U0065><U006D><U0062><U0072><U0069><U0065>";/
-- "<U0044><U0065><U0063><U0065><U006D><U0062><U0072><U0069><U0065>"
--d_t_fmt "<U0025><U0061><U0020><U0025><U0064><U0020><U0025><U0062><U0020><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>"
--d_fmt "<U0025><U0059><U002D><U0025><U006D><U002D><U0025><U0064>"
-+%
-+% Month names are _not_ capitalized in Romanian:
-+% ianuarie februarie martie
-+% aprilie mai iunie
-+% iulie august septembrie
-+% octombrie noiembrie decembrie
-+mon "<U0069><U0061><U006E><U0075><U0061><U0072><U0069><U0065>";/
-+ "<U0066><U0065><U0062><U0072><U0075><U0061><U0072><U0069><U0065>";/
-+ "<U006D><U0061><U0072><U0074><U0069><U0065>";/
-+ "<U0061><U0070><U0072><U0069><U006C><U0069><U0065>";/
-+ "<U006D><U0061><U0069>";/
-+ "<U0069><U0075><U006E><U0069><U0065>";/
-+ "<U0069><U0075><U006C><U0069><U0065>";/
-+ "<U0061><U0075><U0067><U0075><U0073><U0074>";/
-+ "<U0073><U0065><U0070><U0074><U0065><U006D><U0062><U0072><U0069><U0065>";/
-+ "<U006F><U0063><U0074><U006F><U006D><U0062><U0072><U0069><U0065>";/
-+ "<U006E><U006F><U0069><U0065><U006D><U0062><U0072><U0069><U0065>";/
-+ "<U0064><U0065><U0063><U0065><U006D><U0062><U0072><U0069><U0065>"
-+% Appropriate date and time representation (%c)
-+% Romania uses daylight saving and the names of the time zones are
-+% not widely known nor used
-+% "%a %d %b %Y %T %z"
-+d_t_fmt "<U0025><U0061><U0020><U0025><U0064><U0020><U0025><U0062><U0020>/
-+<U0025><U0059><U0020><U0025><U0054><U0020><U0025><U007A>"
-+%
-+% Appropriate date representation (%x)
-+% "%d.%m.%Y"
-+d_fmt "<U0025><U0064><U002E><U0025><U006D><U002E><U0025><U0059>"
-+% 24 hour format is used,
- t_fmt "<U0025><U0054>"
-+% thus no am/pm markers are defined/used
- am_pm "";""
-+% also am/pm hour display format is not used
- t_fmt_ampm ""
--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>"
-+% %A %-e %B %Y, %H:%M:%S %z
-+date_fmt "<U0025><U0041><U0020><U0025><U002D><U0065><U0020><U0025><U0042>/
-+<U0020><U0025><U0059><U002C><U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/
-+<U0025><U007A>"
-+% First week day is Monday
-+first_weekday 2
-+% First work day is Monday
-+first_workday 2
- END LC_TIME
-
-+
-+% Romania uses A4 paper format
- 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 "<U0034><U0030>"
- END LC_TELEPHONE
-
-+
-+% Romania uses the metric system
- 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>"
-+% Format of a name, taken from the glibc locale for Ukrainian.
-+% %f Family names.
-+% %F Family names in uppercase.
-+% %g First given name.
-+% %G First given initial.
-+% %l First given name with Latin letters.
-+% %o Other shorter name.
-+% %m Additional given names.
-+% %M Initials for additional given names.
-+% %p Profession.
-+% %s Salutation, such as "Doctor"
-+% %S Abbreviated salutation, such as "Mr." or "Dr."
-+% %d Salutation, using the FDCC-sets conventions
-+% 1 for the name_gen
-+% 2 for name_mr
-+% 3 for name_mrs
-+% 4 for name_miss
-+% 5 for name_ms
-+% %t If the preceding field descriptor resulted in an empty string,
-+% then the empty string, else a <space>.
-+%
-+% FIXME: There are two prefered ways:
-+% %d%t%s%t%g%t%f and %d%t%s%t%f%t%g%t%m
-+% The current tendency is to use the first form, while the second is the most
-+% popular form, it is widespread and widely known.
-+% Now we stick to the traditional/old/second form: %d%t%s%t%f%t%g%t%m
-+name_fmt "<U0025><U0064><U0025><U0074><U0025><U0073><U0025>/
-+<U0074><U0025><U0066><U0025><U0074><U0025><U0067><U0025><U0074>/
-+<U0025><U006D>"
-+% Dl.
-+name_mr "<U0044><U006C><U002E>"
-+% D-na.
-+name_mrs "<U0044><U002D><U006E><U0061><U002E>"
-+% D-ra.
-+name_miss "<U0044><U002D><U0072><U0061><U002E>"
- 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><U0025><U007A><U0020><U0025><U0054><U0025>/
--<U004E><U0025><U0063><U0025><U004E>"
-+% Format of an address. The fields have the following meaning
-+% (inspired originaly by glibc locale for Ukranian):
-+
-+% %n Person's name, possibly constructed with the LC_NAME
-+% "name_fmt" keyword. (it appears to be invalid)
-+% %a Care of person, or organization.
-+% %f Firm name.
-+% %d Department name.
-+% %b Building name.
-+% %s Street or block (eg. Japanese) name.
-+% %h House number or designation.
-+% %N Insert an <end-of-line> if the previous descriptor
-+% value was not an empty string; otherwise ignore.
-+% %t Insert a <space> if the previous descriptor value
-+% was not an empty string; otherwise ignore.
-+% %r Room number, door designation.
-+% %e Floor number.
-+% %C Country designation, from the <country_post> keyword.
-+% %l Local township within town or city. (it appears to be invalid)
-+% %z Zip number, postal code.
-+% %T Town, city.
-+% %S State, province, or prefecture.
-+% %c Country, as taken from data record.
-+%
-+% FIXME: it appears that %n and %l are not working; correct form is:
-+% %n%N%f%N%a%d%N%s%t%h%N%b%t%e%t%r%N%l%z%t%T%N%S%t%c%N
-+% implemented form:
-+% %f%N%a%d%N%s%t%h%N%b%t%e%t%r%N%z%t%T%N%S%t%c%N
-+postal_fmt "<U0025><U0066>/
-+<U0025><U004E><U0025><U0061><U0025><U0064><U0025><U004E>/
-+<U0025><U0073><U0025><U0074><U0025><U0068><U0025><U004E>/
-+<U0025><U0062><U0025><U0074><U0025><U0065><U0025><U0074>/
-+<U0025><U0072><U0025><U004E><U0025><U007A>/
-+<U0025><U0074><U0025><U0054><U0025><U004E><U0025><U0053>/
-+<U0025><U0074><U0025><U0063><U0025><U004E>"
-+% Country names are capitalized: Roma>nia
-+country_name "<U0052><U006F><U006D><U00E2><U006E><U0069><U0061>"
- country_ab2 "<U0052><U004F>"
- country_ab3 "<U0052><U004F><U0055>"
- country_num 642
-+country_car "<U0052><U004F>"
-+% ISBN code is 973
-+% see: http://homepages.cwi.nl/~dik/english/codes/isbn.html
-+% and other sources
-+country_isbn 973
-+% FIXME: is it really RO?
-+country_post "<U0052><U004F>"
-+% language names are not capitalized in Romanian ( roma>na( )
-+lang_name "<U0072><U006F><U006D><U00E2><U006E><U0103>"
-+lang_ab "<U0072><U006F>"
-+% set the terminology code to "ron" as defined in iso639-2
-+lang_term "<U0072><U006F><U006E>"
-+% set the bibliographic code to "rum" as defined in iso639-2
-+lang_lib "<U0072><U0075><U006D>"
- END LC_ADDRESS
+# All lines beginning with `# DP:' are a description of the patch.
+# DP: Description: Fix Romanian locale
+# DP: Dpatch author: Eddy Petrisor <eddy.petrisor@gmail.com>
+# DP: Patch author: Eddy Petrisor <eddy.petrisor@gmail.com>
+# DP: Upstream status: BZ2125
+# DP: Date: 2006-02-24
+
+2006-01-07 Eddy Petrisor <eddy.petrisor@gmail.com>
+
+ * locales/ro_RO: Correct the sorting order of the letters a
+ circumflex and a with breve according to the Romanian alphabet.
+ * locales/ro_RO: Do not use capital A with breve within day names
+ * locales/ro_RO: Use Romanian post-92 writing rules within day
+ * locales/ro_RO: After denomination starting with the 1st of July 2005,
+ int'l currency symbol is RON (1 RON = 10000 ROL);
+ see http://publications.eu.int/code/en/en-5000700.htm;
+ * locales/ro_RO: groupping sign for thousands is "."; group of 3
+ * locales/ro_RO: short date format is %d.%m.%Y for RO
+ * locales/ro_RO: placed year before time in date_fmt
+ * locales/ro_RO: replaced %Z with %z in date formats because %Z is not
+ used nor widely known in Romania, and Romania uses daylight saving and
+ the difference is more obvious this way
+ * locales/ro_RO: changed abday for Saturday as i> looks bad and is
+ incorrect according to post-92 rules
+ * locales/ro_RO: do not capitalize months and days as it is not correct
+ in Romanian
+ * locales/ro_RO: A4 is the prefered paper type; metric system is used
+ (removed FIXMEs)
+ * locales/ro_RO: added country_name, country_car, lang_name and lang_ab
+ * locales/ro_RO: added name_mr, name_mrs, name_miss (name_ms omitted as
+ there is no such proper form in Romanian)
+ * locales/ro_RO: added explanation related to the cedilla/comma issue and
+ the reson why the transliteration is a good idea
+ * locales/ro_RO: changed default encoding to UTF-8 - this is the only
+ encoding that supports all Romanian specific symbols (see encoding table
+ in Debian BTS, #119528 and the corresponding comments in #347173)
+ * locales/ro_RO: Corrected the name format (salutation abbreviation was
+ omitted)
+ * locales/ro_RO: Corrected postal_fmt (See address examples from
+ Romanian Ministries' sites in Debian BTS #347173)
+ * locales/ro_RO: first_weekday and first_workday are both Monday
+ * locales/ro_RO: added terminology and bibliographic codes for RO
+ reference: http://www.loc.gov/standards/iso639-2/langcodes.html#qr
+ * locales/ro_RO: added isbn code
+ * locales/ro_RO: added postal code - RO (not 100% sure)
+
+Index: localedata/locales/ro_RO
+===================================================================
+--- localedata/locales/ro_RO.orig
++++ localedata/locales/ro_RO
+@@ -15,9 +15,13 @@
+ % Date: 1996-10-15
+ % Application: general
+ % Users: general
+-% Charset: ISO-8859-2
++% Charset: UTF-8
+ % Distribution and use is free, also
+ % for commercial purposes.
++%
++% Corrections by:
++% 2006-01-07
++% Eddy Petrisor <eddy.petrisor@gmail.com>
+
+ LC_IDENTIFICATION
+ title "Romanian locale for Romania"
+@@ -51,10 +55,11 @@
+ % Copy the template from ISO/IEC 14651
+ copy "iso14651_t1"
+
+-% a a> a( b c d e f g h i i> j k l m n o p q r s s, t t, u v w x y z
++% The modern Romanian alphabet has 31 letters, ordered as below:
++% a a( a> b c d e f g h i i> j k l m n o p q r s s, t t, u v w x y z
+
+-collating-symbol <a/>>
+ collating-symbol <a(>
++collating-symbol <a/>>
+ collating-symbol <i/>>
+ collating-symbol <s,>
+ collating-symbol <t,>
+@@ -64,8 +69,8 @@
+ <BRE>
+
+ reorder-after <a>
+-<a/>>
+ <a(>
++<a/>>
+ reorder-after <i>
+ <i/>>
+ reorder-after <s>
+@@ -74,11 +79,11 @@
+ <t,>
+
+ reorder-after <U0061>
+-<U00E2> <a/>>;<CIR>;<MIN>;IGNORE
+ <U0103> <a(>;<BRE>;<MIN>;IGNORE
++<U00E2> <a/>>;<CIR>;<MIN>;IGNORE
+ reorder-after <U0041>
+-<U00C2> <a/>>;<CIR>;<CAP>;IGNORE
+ <U0102> <a(>;<BRE>;<CAP>;IGNORE
++<U00C2> <a/>>;<CIR>;<CAP>;IGNORE
+
+ reorder-after <U0069>
+ <U00EE> <i/>>;<CIR>;<MIN>;IGNORE
+@@ -89,23 +94,36 @@
+ <U0219> <s,>;<CDI>;<MIN>;IGNORE
+ <U015F> <s,>;<CDI>;<MIN>;IGNORE
+ reorder-after <U0053>
+-<U0218> <s,>;<CDI>;<MIN>;IGNORE
++<U0218> <s,>;<CDI>;<CAP>;IGNORE
+ <U015E> <s,>;<CDI>;<CAP>;IGNORE
+
+ reorder-after <U0074>
+ <U021B> <t,>;<CDI>;<MIN>;IGNORE
+ <U0163> <t,>;<CDI>;<MIN>;IGNORE
+ reorder-after <U0054>
+-<U021A> <t,>;<CDI>;<MIN>;IGNORE
++<U021A> <t,>;<CDI>;<CAP>;IGNORE
+ <U0162> <t,>;<CDI>;<CAP>;IGNORE
+
+ reorder-end
+
+ END LC_COLLATE
+
++
++
+ LC_CTYPE
+ copy "i18n"
+
++%
++% Transliteration is _currently_ a good idea as most fonts/applications do not
++% have the correct diacritics for "t comma bellow" (U021A, U021B) and
++% "s comma bellow" (U0218, U0219). Thus we currently use and compromise with
++% "t cedilla" (U0162, U0163) - which, actually, does not belong to any
++% language - and "s cedilla" (U015E, U015F) - which is _not_ correct for
++% Romanian, but is correct for Turkish.
++%
++% This issue should be fixed in the future, when enough font and application
++% support will be provided in current operating systems.
++%
+ translit_start
+ include "translit_combining";""
+
+@@ -124,19 +142,31 @@
+ translit_end
+ END LC_CTYPE
+
++
++
+ LC_MESSAGES
+ yesexpr "<U005E><U005B><U0044><U0064><U0059><U0079><U005D><U002E><U002A>"
+ noexpr "<U005E><U005B><U006E><U004E><U005D><U002E><U002A>"
+ END LC_MESSAGES
+
++
+ LC_MONETARY
+-int_curr_symbol "<U0052><U004F><U004C><U0020>"
++% Since the 1st of July 2005, the new currency is the ROmanian New leu
++% the symbol is RON and 1 RON = 10000 ROL (old ROmanian Leu)...
++int_curr_symbol "<U0052><U004F><U004E><U0020>"
++% but representing counted coins is made in the same way as before.
+ currency_symbol "<U004C><U0065><U0069>"
++% decimal point is comma
+ mon_decimal_point "<U002C>"
++% the separation of digits is made in groups of three
++% and the separator between the groups is the full stop (dot)
+ mon_thousands_sep "<U002E>"
+ mon_grouping 3;3
++% the positive sign is not usualy represented
+ positive_sign ""
++% while the negative one is
+ negative_sign "<U002D>"
++% usualy one will display only two digits after the decimal point
+ int_frac_digits 2
+ frac_digits 2
+ p_cs_precedes 1
+@@ -147,80 +177,213 @@
+ n_sign_posn 1
+ END LC_MONETARY
+
++
+ LC_NUMERIC
++% same rules as for monetary apply for regular figures:
++% decimal point is comma
+ decimal_point "<U002C>"
+-thousands_sep ""
+-grouping 0;0
++% and the separator between groups is full stop
++thousands_sep "<U002E>"
++% the separation of figures is made in groups of three
++grouping 3;3
+ END LC_NUMERIC
+
++
+ LC_TIME
++% abbreviated day names are (starting from Monday): Lu Ma Mi Jo Vi Sb Du
+ abday "<U0044><U0075>";"<U004C><U0075>";"<U004D><U0061>";"<U004D><U0069>";/
+- "<U004A><U006F>";"<U0056><U0069>";"<U0053><U00EE>"
+-day "<U0044><U0075><U006D><U0069><U006E><U0069><U0063><U0102>";/
+- "<U004C><U0075><U006E><U0069>";/
+- "<U004D><U0061><U0072><U0163><U0069>";/
+- "<U004D><U0069><U0065><U0072><U0063><U0075><U0072><U0069>";/
+- "<U004A><U006F><U0069>";/
+- "<U0056><U0069><U006E><U0065><U0072><U0069>";/
+- "<U0053><U00EE><U006D><U0062><U0102><U0074><U0102>"
++ "<U004A><U006F>";"<U0056><U0069>";"<U0053><U0062>"
++%
++% Because in 1992 the Romanian Academy stated that within words the
++% writing of the letter i> (i circumflex - U00EE) should be replaced
++% by a> (acircumflex - U00E2), we use the post92 writing.
++% Note: The actual rule is more complex, but the case which applies for
++% Satruday is covered by the exposed explanation above.
++%
++% Day names are not capitalized:
++% duminic<abreve>, luni, mar<tcomma>i,
++% miercuri, joi, vineri,
++% s<acircumflex>mb<abreve>t<abreve>
++%
++% Note that Tuesday Romanian day should be using t comma, not t cedilla,
++% but due to the low availability of the glyph (U021B) in fonts we use
++% the "so called t cedilla"
++day "<U0064><U0075><U006D><U0069><U006E><U0069><U0063><U0103>";/
++ "<U006C><U0075><U006E><U0069>";/
++ "<U006D><U0061><U0072><U0163><U0069>";/
++ "<U006D><U0069><U0065><U0072><U0063><U0075><U0072><U0069>";/
++ "<U006A><U006F><U0069>";/
++ "<U0076><U0069><U006E><U0065><U0072><U0069>";/
++ "<U0073><U00E2><U006D><U0062><U0103><U0074><U0103>"
++%
++% All month abbreviations are composed of the first three letters of the full
++% Romanian names of the months, except for November, whose abbreviation comes
++% from the Latin month name, thus the abbreviation is "nov"
++%
++% Month names are not capitalized:
++% ian feb mar apr mai iun iul aug sep oct nov dec
+ abmon "<U0069><U0061><U006E>";"<U0066><U0065><U0062>";/
+ "<U006D><U0061><U0072>";"<U0061><U0070><U0072>";/
+ "<U006D><U0061><U0069>";"<U0069><U0075><U006E>";/
+ "<U0069><U0075><U006C>";"<U0061><U0075><U0067>";/
+ "<U0073><U0065><U0070>";"<U006F><U0063><U0074>";/
+ "<U006E><U006F><U0076>";"<U0064><U0065><U0063>"
+-mon "<U0049><U0061><U006E><U0075><U0061><U0072><U0069><U0065>";/
+- "<U0046><U0065><U0062><U0072><U0075><U0061><U0072><U0069><U0065>";/
+- "<U004D><U0061><U0072><U0074><U0069><U0065>";/
+- "<U0041><U0070><U0072><U0069><U006C><U0069><U0065>";/
+- "<U004D><U0061><U0069>";/
+- "<U0049><U0075><U006E><U0069><U0065>";/
+- "<U0049><U0075><U006C><U0069><U0065>";/
+- "<U0041><U0075><U0067><U0075><U0073><U0074>";/
+- "<U0053><U0065><U0070><U0074><U0065><U006D><U0062><U0072><U0069><U0065>";/
+- "<U004F><U0063><U0074><U006F><U006D><U0062><U0072><U0069><U0065>";/
+- "<U004E><U006F><U0069><U0065><U006D><U0062><U0072><U0069><U0065>";/
+- "<U0044><U0065><U0063><U0065><U006D><U0062><U0072><U0069><U0065>"
+-d_t_fmt "<U0025><U0061><U0020><U0025><U0064><U0020><U0025><U0062><U0020><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>"
+-d_fmt "<U0025><U0059><U002D><U0025><U006D><U002D><U0025><U0064>"
++%
++% Month names are _not_ capitalized in Romanian:
++% ianuarie februarie martie
++% aprilie mai iunie
++% iulie august septembrie
++% octombrie noiembrie decembrie
++mon "<U0069><U0061><U006E><U0075><U0061><U0072><U0069><U0065>";/
++ "<U0066><U0065><U0062><U0072><U0075><U0061><U0072><U0069><U0065>";/
++ "<U006D><U0061><U0072><U0074><U0069><U0065>";/
++ "<U0061><U0070><U0072><U0069><U006C><U0069><U0065>";/
++ "<U006D><U0061><U0069>";/
++ "<U0069><U0075><U006E><U0069><U0065>";/
++ "<U0069><U0075><U006C><U0069><U0065>";/
++ "<U0061><U0075><U0067><U0075><U0073><U0074>";/
++ "<U0073><U0065><U0070><U0074><U0065><U006D><U0062><U0072><U0069><U0065>";/
++ "<U006F><U0063><U0074><U006F><U006D><U0062><U0072><U0069><U0065>";/
++ "<U006E><U006F><U0069><U0065><U006D><U0062><U0072><U0069><U0065>";/
++ "<U0064><U0065><U0063><U0065><U006D><U0062><U0072><U0069><U0065>"
++% Appropriate date and time representation (%c)
++% Romania uses daylight saving and the names of the time zones are
++% not widely known nor used
++% "%a %d %b %Y %T %z"
++d_t_fmt "<U0025><U0061><U0020><U0025><U0064><U0020><U0025><U0062><U0020>/
++<U0025><U0059><U0020><U0025><U0054><U0020><U0025><U007A>"
++%
++% Appropriate date representation (%x)
++% "%d.%m.%Y"
++d_fmt "<U0025><U0064><U002E><U0025><U006D><U002E><U0025><U0059>"
++% 24 hour format is used,
+ t_fmt "<U0025><U0054>"
++% thus no am/pm markers are defined/used
+ am_pm "";""
++% also am/pm hour display format is not used
+ t_fmt_ampm ""
+-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>"
++% %A %-e %B %Y, %H:%M:%S %z
++date_fmt "<U0025><U0041><U0020><U0025><U002D><U0065><U0020><U0025><U0042>/
++<U0020><U0025><U0059><U002C><U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/
++<U0025><U007A>"
++% First week day is Monday
++first_weekday 2
++% First work day is Monday
++first_workday 2
+ END LC_TIME
+
++
++% Romania uses A4 paper format
+ 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 "<U0034><U0030>"
+ END LC_TELEPHONE
+
++
++% Romania uses the metric system
+ 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>"
++% Format of a name, taken from the glibc locale for Ukrainian.
++% %f Family names.
++% %F Family names in uppercase.
++% %g First given name.
++% %G First given initial.
++% %l First given name with Latin letters.
++% %o Other shorter name.
++% %m Additional given names.
++% %M Initials for additional given names.
++% %p Profession.
++% %s Salutation, such as "Doctor"
++% %S Abbreviated salutation, such as "Mr." or "Dr."
++% %d Salutation, using the FDCC-sets conventions
++% 1 for the name_gen
++% 2 for name_mr
++% 3 for name_mrs
++% 4 for name_miss
++% 5 for name_ms
++% %t If the preceding field descriptor resulted in an empty string,
++% then the empty string, else a <space>.
++%
++% FIXME: There are two prefered ways:
++% %d%t%s%t%g%t%f and %d%t%s%t%f%t%g%t%m
++% The current tendency is to use the first form, while the second is the most
++% popular form, it is widespread and widely known.
++% Now we stick to the traditional/old/second form: %d%t%s%t%f%t%g%t%m
++name_fmt "<U0025><U0064><U0025><U0074><U0025><U0073><U0025>/
++<U0074><U0025><U0066><U0025><U0074><U0025><U0067><U0025><U0074>/
++<U0025><U006D>"
++% Dl.
++name_mr "<U0044><U006C><U002E>"
++% D-na.
++name_mrs "<U0044><U002D><U006E><U0061><U002E>"
++% D-ra.
++name_miss "<U0044><U002D><U0072><U0061><U002E>"
+ 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><U0025><U007A><U0020><U0025><U0054><U0025>/
+-<U004E><U0025><U0063><U0025><U004E>"
++% Format of an address. The fields have the following meaning
++% (inspired originaly by glibc locale for Ukranian):
++
++% %n Person's name, possibly constructed with the LC_NAME
++% "name_fmt" keyword. (it appears to be invalid)
++% %a Care of person, or organization.
++% %f Firm name.
++% %d Department name.
++% %b Building name.
++% %s Street or block (eg. Japanese) name.
++% %h House number or designation.
++% %N Insert an <end-of-line> if the previous descriptor
++% value was not an empty string; otherwise ignore.
++% %t Insert a <space> if the previous descriptor value
++% was not an empty string; otherwise ignore.
++% %r Room number, door designation.
++% %e Floor number.
++% %C Country designation, from the <country_post> keyword.
++% %l Local township within town or city. (it appears to be invalid)
++% %z Zip number, postal code.
++% %T Town, city.
++% %S State, province, or prefecture.
++% %c Country, as taken from data record.
++%
++% FIXME: it appears that %n and %l are not working; correct form is:
++% %n%N%f%N%a%d%N%s%t%h%N%b%t%e%t%r%N%l%z%t%T%N%S%t%c%N
++% implemented form:
++% %f%N%a%d%N%s%t%h%N%b%t%e%t%r%N%z%t%T%N%S%t%c%N
++postal_fmt "<U0025><U0066>/
++<U0025><U004E><U0025><U0061><U0025><U0064><U0025><U004E>/
++<U0025><U0073><U0025><U0074><U0025><U0068><U0025><U004E>/
++<U0025><U0062><U0025><U0074><U0025><U0065><U0025><U0074>/
++<U0025><U0072><U0025><U004E><U0025><U007A>/
++<U0025><U0074><U0025><U0054><U0025><U004E><U0025><U0053>/
++<U0025><U0074><U0025><U0063><U0025><U004E>"
++% Country names are capitalized: Roma>nia
++country_name "<U0052><U006F><U006D><U00E2><U006E><U0069><U0061>"
+ country_ab2 "<U0052><U004F>"
+ country_ab3 "<U0052><U004F><U0055>"
+ country_num 642
++country_car "<U0052><U004F>"
++% ISBN code is 973
++% see: http://homepages.cwi.nl/~dik/english/codes/isbn.html
++% and other sources
++country_isbn 973
++% FIXME: is it really RO?
++country_post "<U0052><U004F>"
++% language names are not capitalized in Romanian ( roma>na( )
++lang_name "<U0072><U006F><U006D><U00E2><U006E><U0103>"
++lang_ab "<U0072><U006F>"
++% set the terminology code to "ron" as defined in iso639-2
++lang_term "<U0072><U006F><U006E>"
++% set the bibliographic code to "rum" as defined in iso639-2
++lang_lib "<U0072><U0075><U006D>"
+ END LC_ADDRESS
Added: glibc-package/trunk/debian/patches/localedata/locale-se_NO.diff
===================================================================
--- glibc-package/trunk/debian/patches/localedata/locale-se_NO.diff 2006-06-05 22:39:01 UTC (rev 1620)
+++ glibc-package/trunk/debian/patches/localedata/locale-se_NO.diff 2006-06-05 23:02:25 UTC (rev 1621)
@@ -0,0 +1,32 @@
+# All lines beginning with `# DP:' are a description of the patch.
+# DP: Description: Fix se_NO locale
+# DP: Dpatch author: Denis Barbier
+# DP: Patch author: Denis Barbier
+# DP: Upstream status: Not submitted yet
+# DP: Date: 2006-06-02
+
+Index: glibc-2.3.6/localedata/locales/se_NO
+===================================================================
+--- glibc-2.3.6.orig/localedata/locales/se_NO
++++ glibc-2.3.6/localedata/locales/se_NO
+@@ -138,7 +138,7 @@
+ <U01EF> <ezhcaron>;<CAR>;<MIN>;IGNORE % ezh caron
+
+ reorder-after <U010A>
+-<U01B7> <ezh>;<BAS>;<MIN>;IGNORE % EZH
++<U01B7> <ezh>;<BAS>;<CAP>;IGNORE % EZH
+ <U01EE> <ezhcaron>;<CAR>;<CAP>;IGNORE % EZH caron
+
+ reorder-after <U0064>
+@@ -165,9 +165,10 @@
+ reorder-after <U0136>
+ <U01E8> <kcaron>;<CAR>;<CAP>;IGNORE % Kcaron
+
+-reorder-after <U0053>
++reorder-after <U0073>
+ <U00DF> <ssharp>;"<LIG><LIG>";"<MIN><MIN>";IGNORE % �+ <U0161> <scaron>;<CAR>;<MIN>;IGNORE % 288 <s<>
++reorder-after <U0053>
+ <U0160> <scaron>;<CAR>;<CAP>;IGNORE % 405 <S<>
+
+
Modified: glibc-package/trunk/debian/patches/localedata/tailor-iso14651_t1.diff
===================================================================
--- glibc-package/trunk/debian/patches/localedata/tailor-iso14651_t1.diff 2006-06-05 22:39:01 UTC (rev 1620)
+++ glibc-package/trunk/debian/patches/localedata/tailor-iso14651_t1.diff 2006-06-05 23:02:25 UTC (rev 1621)
@@ -2108,7 +2108,7 @@
===================================================================
--- localedata/locales/da_DK.orig
+++ localedata/locales/da_DK
-@@ -55,2082 +55,78 @@
+@@ -55,2082 +55,83 @@
END LC_IDENTIFICATION
LC_COLLATE
@@ -2129,6 +2129,9 @@
+<CAP-MIN>
+<MIN-CAP>
+
++reorder-after <OBL>
++<ETH>
++
+reorder-after <z>
+<ae>
+<o-stroke>
@@ -3616,8 +3619,9 @@
-<z8>
+reorder-after <U0178>
+<U00DC> <y>;<U00DC>;<CAP>;IGNORE
++<U0170> <y>;<U0170>;<CAP>;IGNORE
++reorder-after <U00FF>
+<U00FC> <y>;<U00DC>;<MIN>;IGNORE
-+<U0170> <y>;<U0170>;<CAP>;IGNORE
+<U0171> <y>;<U0170>;<MIN>;IGNORE
+
% <U00C6> is a separate letter in Danish
@@ -3631,13 +3635,9 @@
-<U00E4> <U00C6>;<SPECIAL>;<SMALL>;IGNORE
+reorder-after <U017B>
+<U00C6> <ae>;<BAS>;<CAP>;IGNORE
-+<U00E6> <ae>;<BAS>;<MIN>;IGNORE
+<U01FC> <ae>;<ACA>;<CAP>;IGNORE
-+<U01FD> <ae>;<ACA>;<MIN>;IGNORE
+<U00C4> <ae>;<REU>;<CAP>;IGNORE
-+<U00E4> <ae>;<REU>;<MIN>;IGNORE
+<U01E2> <ae>;<MAC>;<CAP>;IGNORE
-+<U01E3> <ae>;<MAC>;<MIN>;IGNORE
% <U00D8> is a separate letter in Danish
-<U00D8> <U00D8>;<NONE>;<CAPITAL>;IGNORE
-<U00F8> <U00D8>;<NONE>;<SMALL>;IGNORE
@@ -3648,13 +3648,9 @@
-<U0150> <U00D8>;<DOUBLE-ACUTE>;<CAPITAL>;IGNORE
-<U0151> <U00D8>;<DOUBLE-ACUTE>;<SMALL>;IGNORE
+<U00D8> <o-stroke>;<BAS>;<CAP>;IGNORE
-+<U00F8> <o-stroke>;<BAS>;<MIN>;IGNORE
+<U01FE> <o-stroke>;<ACA>;<CAP>;IGNORE
-+<U01FF> <o-stroke>;<ACA>;<MIN>;IGNORE
+<U00D6> <o-stroke>;<REU>;<CAP>;IGNORE
-+<U00F6> <o-stroke>;<REU>;<MIN>;IGNORE
+<U0150> <o-stroke>;<DAC>;<CAP>;IGNORE
-+<U0151> <o-stroke>;<DAC>;<MIN>;IGNORE
% <U00C5> is a separate letter in Danish
-<U00C5> <U00C5>;<NONE>;<CAPITAL>;IGNORE
-<U00E5> <U00C5>;<NONE>;<SMALL>;IGNORE
@@ -4228,9 +4224,19 @@
-
-order_end
+<U00C5> <a-ring>;<BAS>;<CAP>;IGNORE
-+<U00E5> <a-ring>;<BAS>;<MIN>;IGNORE
+<A-A> <a-ring>;<A-A>;<CAP>;IGNORE
+<A-a> <a-ring>;<A-A>;<CAP-MIN>;IGNORE
++
++reorder-after <U017C>
++<U00E6> <ae>;<BAS>;<MIN>;IGNORE
++<U01FD> <ae>;<ACA>;<MIN>;IGNORE
++<U00E4> <ae>;<REU>;<MIN>;IGNORE
++<U01E3> <ae>;<MAC>;<MIN>;IGNORE
++<U00F8> <o-stroke>;<BAS>;<MIN>;IGNORE
++<U01FF> <o-stroke>;<ACA>;<MIN>;IGNORE
++<U00F6> <o-stroke>;<REU>;<MIN>;IGNORE
++<U0151> <o-stroke>;<DAC>;<MIN>;IGNORE
++<U00E5> <a-ring>;<BAS>;<MIN>;IGNORE
+<a-A> <a-ring>;<A-A>;<MIN-CAP>;IGNORE
+<a-a> <a-ring>;<A-A>;<MIN>;IGNORE
+
@@ -4238,15 +4244,14 @@
+% removed from latest iso14651 tables.
+reorder-after <U0162>
+<U00DE> "<t><h>";"<LIG><LIG>";"<CAP><CAP>";IGNORE
++reorder-after <U0163>
+<U00FE> "<t><h>";"<LIG><LIG>";"<MIN><MIN>";IGNORE
+
-+reorder-after <OBL>
-+<ETH>
-+
+reorder-after <U0064>
+<U0110> <d>;<OBL>;<CAP>;IGNORE
++<U00D0> <d>;<ETH>;<CAP>;IGNORE
++reorder-after <U0044>
+<U0111> <d>;<OBL>;<MIN>;IGNORE
-+<U00D0> <d>;<ETH>;<CAP>;IGNORE
+<U00F0> <d>;<ETH>;<MIN>;IGNORE
+reorder-end
@@ -8472,7 +8477,7 @@
+<c-H> <ch>;<BAS>;<MIN-CAP>;IGNORE
+<c-h> <ch>;<BAS>;<MIN>;IGNORE
+
-+reorder-after <U0043>
++reorder-after <U0043>
+<C-H> <ch>;<BAS>;<CAP>;IGNORE
+<C-h> <ch>;<BAS>;<CAP-MIN>;IGNORE
+
@@ -10547,7 +10552,7 @@
-<U3092> <U30F2>;<U3092>;IGNORE;IGNORE
-<U30F3> <U30F3>;<U30F3>;IGNORE;IGNORE
-<U3093> <U30F3>;<U3093>;IGNORE;IGNORE
-+reorder-after <U004C>
++reorder-after <U004C>
+<L-L> <ll>;<BAS>;<CAP>;IGNORE
+<L-l> <ll>;<BAS>;<CAP-MIN>;IGNORE
@@ -10560,7 +10565,7 @@
===================================================================
--- localedata/locales/fi_FI.orig
+++ localedata/locales/fi_FI
-@@ -52,2068 +52,74 @@
+@@ -52,2068 +52,79 @@
END LC_IDENTIFICATION
LC_COLLATE
@@ -10576,60 +10581,65 @@
+<a-diaerisis>
+<o-diaerisis>
+
++reorder-after <U007A>
++<U00E5> <a-ring>;<BAS>;<MIN>;IGNORE
++<U01FB> <a-ring>;<ACA>;<MIN>;IGNORE
++<U00E4> <a-diaerisis>;<BAS>;<MIN>;IGNORE
++<U00E6> <a-diaerisis>;<REU>;<MIN>;IGNORE
++<U01FD> <a-diaerisis>;<U01FD>;<MIN>;IGNORE
++<U01E3> <a-diaerisis>;<MAC>;<MIN>;IGNORE
++<U00F6> <o-diaerisis>;<BAS>;<MIN>;IGNORE
++<U00F8> <o-diaerisis>;<U00D8>;<MIN>;IGNORE
++<U01FF> <o-diaerisis>;<U01FF>;<MIN>;IGNORE
++<U00F5> <o-diaerisis>;<TIL>;<MIN>;IGNORE
+reorder-after <U005A>
-+<U00E5> <a-ring>;<BAS>;<MIN>;IGNORE
+<U00C5> <a-ring>;<BAS>;<CAP>;IGNORE
-+<U01FB> <a-ring>;<ACA>;<MIN>;IGNORE
+<U01FA> <a-ring>;<ACA>;<CAP>;IGNORE
-+<U00E4> <a-diaerisis>;<BAS>;<MIN>;IGNORE
+<U00C4> <a-diaerisis>;<BAS>;<CAP>;IGNORE
-+<U00E6> <a-diaerisis>;<REU>;<MIN>;IGNORE
+<U00C6> <a-diaerisis>;<REU>;<CAP>;IGNORE
-+<U01FD> <a-diaerisis>;<U01FD>;<MIN>;IGNORE
+<U01FC> <a-diaerisis>;<U01FD>;<CAP>;IGNORE
-+<U01E3> <a-diaerisis>;<MAC>;<MIN>;IGNORE
+<U01E2> <a-diaerisis>;<MAC>;<CAP>;IGNORE
-+<U00F6> <o-diaerisis>;<BAS>;<MIN>;IGNORE
+<U00D6> <o-diaerisis>;<BAS>;<CAP>;IGNORE
-+<U00F8> <o-diaerisis>;<U00D8>;<MIN>;IGNORE
+<U00D8> <o-diaerisis>;<U00D8>;<CAP>;IGNORE
-+<U01FF> <o-diaerisis>;<U01FF>;<MIN>;IGNORE
+<U01FE> <o-diaerisis>;<U01FF>;<CAP>;IGNORE
-+<U00F5> <o-diaerisis>;<TIL>;<MIN>;IGNORE
+<U00D5> <o-diaerisis>;<TIL>;<CAP>;IGNORE
+
++reorder-after <U016B>
++<U0076> <v>;<U0056>;<BAS>;<MIN>
++<U1E7D> <v>;<U0056>;<TIL>;<MIN>
++<U0077> <w>;<U0057>;<BAS>;<MIN>
++<U1E83> <w>;<U0057>;<ACA>;<MIN>
++<U1E81> <w>;<U0057>;<GRA>;<MIN>
++<U0175> <w>;<U0057>;<CIR>;<MIN>
++<U1E85> <w>;<U0057>;<REU>;<MIN>
++<U1E87> <w>;<U0057>;<PCT>;<MIN>
+reorder-after <U016A>
-+<U0076> <v>;<U0056>;<BAS>;<MIN>
+<U0056> <v>;<U0056>;<BAS>;<CAP>
-+<U1E7D> <v>;<U0056>;<TIL>;<MIN>
+<U1E7C> <v>;<U0056>;<TIL>;<CAP>
-+<U0077> <w>;<U0057>;<BAS>;<MIN>
+<U0057> <w>;<U0057>;<BAS>;<CAP>
-+<U1E83> <w>;<U0057>;<ACA>;<MIN>
+<U1E82> <w>;<U0057>;<ACA>;<CAP>
-+<U1E81> <w>;<U0057>;<GRA>;<MIN>
+<U1E80> <w>;<U0057>;<GRA>;<CAP>
-+<U0175> <w>;<U0057>;<CIR>;<MIN>
+<U0174> <w>;<U0057>;<CIR>;<CAP>
-+<U1E85> <w>;<U0057>;<REU>;<MIN>
+<U1E84> <w>;<U0057>;<REU>;<CAP>
-+<U1E87> <w>;<U0057>;<PCT>;<MIN>
+<U1E86> <w>;<U0057>;<PCT>;<CAP>
+
+reorder-after <U00FF>
+<U00FC> <y>;<DTT>;<MIN>;IGNORE
++reorder-after <U0178>
+<U00DC> <y>;<DTT>;<CAP>;IGNORE
+
+% Present in iso14651_t1, but these definitions seem to have been
+% removed from latest iso14651 tables.
++reorder-after <U0163>
++<U00FE> "<t><h>";"<LIG><LIG>";"<MIN><MIN>";IGNORE
+reorder-after <U0162>
-+<U00FE> "<t><h>";"<LIG><LIG>";"<MIN><MIN>";IGNORE
+<U00DE> "<t><h>";"<LIG><LIG>";"<CAP><CAP>";IGNORE
+
+reorder-after <U0064>
+<U00F0> <d>;<PCL>;<MIN>;IGNORE
++<U0111> <d>;<OBL>;<MIN>;IGNORE
++reorder-after <U0044>
+<U00D0> <d>;<PCL>;<CAP>;IGNORE
-+<U0111> <d>;<OBL>;<MIN>;IGNORE
+<U0110> <d>;<OBL>;<CAP>;IGNORE
-% Ordering algorithm:
@@ -12699,7 +12709,7 @@
===================================================================
--- localedata/locales/nb_NO.orig
+++ localedata/locales/nb_NO
-@@ -48,2078 +48,74 @@
+@@ -48,2078 +48,78 @@
END LC_IDENTIFICATION
LC_COLLATE
@@ -12720,6 +12730,9 @@
+<CAP-MIN>
+<MIN-CAP>
+
++reorder-after <OBL>
++<ETH>
++
+reorder-after <z>
+<ae>
+<o-stroke>
@@ -12727,31 +12740,33 @@
+
+reorder-after <U0178>
+<U00DC> <y>;<U00DC>;<CAP>;IGNORE
++<U0170> <y>;<U0170>;<CAP>;IGNORE
++reorder-after <U00FF>
+<U00FC> <y>;<U00DC>;<MIN>;IGNORE
-+<U0170> <y>;<U0170>;<CAP>;IGNORE
+<U0171> <y>;<U0170>;<MIN>;IGNORE
+
+reorder-after <U017B>
+<U00C6> <ae>;<BAS>;<CAP>;IGNORE
-+<U00E6> <ae>;<BAS>;<MIN>;IGNORE
+<U01FC> <ae>;<ACA>;<CAP>;IGNORE
-+<U01FD> <ae>;<ACA>;<MIN>;IGNORE
+<U01E2> <ae>;<MAC>;<CAP>;IGNORE
-+<U01E3> <ae>;<MAC>;<MIN>;IGNORE
+<U00C4> <ae>;<PCL>;<CAP>;IGNORE
-+<U00E4> <ae>;<PCL>;<MIN>;IGNORE
+<U00D8> <o-stroke>;<BAS>;<CAP>;IGNORE
-+<U00F8> <o-stroke>;<BAS>;<MIN>;IGNORE
+<U01FE> <o-stroke>;<ACA>;<CAP>;IGNORE
-+<U01FF> <o-stroke>;<ACA>;<MIN>;IGNORE
+<U00D6> <o-stroke>;<REU>;<CAP>;IGNORE
-+<U00F6> <o-stroke>;<REU>;<MIN>;IGNORE
+<U0150> <o-stroke>;<DAC>;<CAP>;IGNORE
-+<U0151> <o-stroke>;<DAC>;<MIN>;IGNORE
+<U00C5> <a-ring>;<BAS>;<CAP>;IGNORE
-+<U00E5> <a-ring>;<BAS>;<MIN>;IGNORE
+<A-A> <a-ring>;<A-A>;<CAP>;IGNORE
+<A-a> <a-ring>;<A-A>;<CAP-MIN>;IGNORE
++reorder-after <U017C>
++<U00E6> <ae>;<BAS>;<MIN>;IGNORE
++<U01FD> <ae>;<ACA>;<MIN>;IGNORE
++<U01E3> <ae>;<MAC>;<MIN>;IGNORE
++<U00E4> <ae>;<PCL>;<MIN>;IGNORE
++<U00F8> <o-stroke>;<BAS>;<MIN>;IGNORE
++<U01FF> <o-stroke>;<ACA>;<MIN>;IGNORE
++<U00F6> <o-stroke>;<REU>;<MIN>;IGNORE
++<U0151> <o-stroke>;<DAC>;<MIN>;IGNORE
++<U00E5> <a-ring>;<BAS>;<MIN>;IGNORE
+<a-A> <a-ring>;<A-A>;<MIN-CAP>;IGNORE
+<a-a> <a-ring>;<A-A>;<MIN>;IGNORE
+
@@ -12759,15 +12774,14 @@
+% removed from latest iso14651 tables.
+reorder-after <U0162>
+<U00DE> "<t><h>";"<LIG><LIG>";"<CAP><CAP>";IGNORE
++reorder-after <U0163>
+<U00FE> "<t><h>";"<LIG><LIG>";"<MIN><MIN>";IGNORE
+
-+reorder-after <OBL>
-+<ETH>
-+
+reorder-after <U0064>
+<U0110> <d>;<OBL>;<CAP>;IGNORE
++<U00D0> <d>;<ETH>;<CAP>;IGNORE
++reorder-after <U0044>
+<U0111> <d>;<OBL>;<MIN>;IGNORE
-+<U00D0> <d>;<ETH>;<CAP>;IGNORE
+<U00F0> <d>;<ETH>;<MIN>;IGNORE
-% Base collation scheme: 1994-03-22
@@ -15308,7 +15322,7 @@
+reorder-after <U0068>
+<c-h> <ch>;<BAS>;<MIN>;IGNORE
+
-+reorder-after <U0048>
++reorder-after <U0048>
+<C-H> <ch>;<BAS>;<CAP>;IGNORE
+<C-h> <ch>;<BAS>;<CAP-MIN>;IGNORE
@@ -17322,7 +17336,7 @@
===================================================================
--- localedata/locales/et_EE.orig
+++ localedata/locales/et_EE
-@@ -55,2067 +55,46 @@
+@@ -55,2067 +55,48 @@
END LC_IDENTIFICATION
LC_COLLATE
@@ -17346,24 +17360,26 @@
+<odiaeresis>
+<udiaeresis>
+
++reorder-after <U015E>
++<U0160> <scaron>;<BAS>;<CAP>;IGNORE
++<U005A> <z>;<BAS>;<CAP>;IGNORE
++<U017D> <z>;<CAR>;<CAP>;IGNORE
+reorder-after <U015F>
-+<U0160> <scaron>;<BAS>;<CAP>;IGNORE
+<U0161> <scaron>;<BAS>;<MIN>;IGNORE
-+<U005A> <z>;<BAS>;<CAP>;IGNORE
+<U007A> <z>;<BAS>;<MIN>;IGNORE
-+<U017D> <z>;<CAR>;<CAP>;IGNORE
+<U017E> <z>;<CAR>;<MIN>;IGNORE
+
+reorder-after <U0056>
+<U0057> <v>;<PCL>;<CAP>;IGNORE
++<U00D5> <otilde>;<BAS>;<CAP>;IGNORE
++<U00C4> <adiaeresis>;<BAS>;<CAP>;IGNORE
++<U00D6> <odiaeresis>;<BAS>;<CAP>;IGNORE
++<U00DC> <udiaeresis>;<BAS>;<CAP>;IGNORE
++reorder-after <U0076>
+<U0077> <v>;<PCL>;<MIN>;IGNORE
-+<U00D5> <otilde>;<BAS>;<CAP>;IGNORE
+<U00F5> <otilde>;<BAS>;<MIN>;IGNORE
-+<U00C4> <adiaeresis>;<BAS>;<CAP>;IGNORE
+<U00E4> <adiaeresis>;<BAS>;<MIN>;IGNORE
-+<U00D6> <odiaeresis>;<BAS>;<CAP>;IGNORE
+<U00F6> <odiaeresis>;<BAS>;<MIN>;IGNORE
-+<U00DC> <udiaeresis>;<BAS>;<CAP>;IGNORE
+<U00FC> <udiaeresis>;<BAS>;<MIN>;IGNORE
-% Ordering algorithm:
@@ -19462,7 +19478,7 @@
collating-element <L-J> from "<U004C><U004A>"
collating-element <L-j> from "<U004C><U006A>"
collating-element <l-J> from "<U006C><U004A>"
-@@ -61,2078 +76,65 @@
+@@ -61,2078 +76,71 @@
collating-element <n-J> from "<U006E><U004A>"
collating-element <n-j> from "<U006E><U006A>"
@@ -21562,36 +21578,42 @@
+
+reorder-after <U0063>
+<U010D> <ccaron>;<BAS>;<MIN>;IGNORE
++<U0107> <cacute>;<BAS>;<MIN>;IGNORE
++reorder-after <U0043>
+<U010C> <ccaron>;<BAS>;<CAP>;IGNORE
-+<U0107> <cacute>;<BAS>;<MIN>;IGNORE
+<U0106> <cacute>;<BAS>;<CAP>;IGNORE
+
+reorder-after <U0064>
+<d-zcaron> <dzcaron>;<BAS>;<MIN>;IGNORE
+<d-Zcaron> <dzcaron>;<BAS>;<MIN-CAP>;IGNORE
++<U0111> <dstroke>;<BAS>;<MIN>;IGNORE
++reorder-after <U0044>
+<D-zcaron> <dzcaron>;<BAS>;<CAP-MIN>;IGNORE
+<D-Zcaron> <dzcaron>;<BAS>;<CAP>;IGNORE
-+<U0111> <dstroke>;<BAS>;<MIN>;IGNORE
+<U0110> <dstroke>;<BAS>;<CAP>;IGNORE
+
+reorder-after <U0140>
+<l-j> <lj>;<BAS>;<MIN>;IGNORE
+<l-J> <lj>;<BAS>;<MIN-CAP>;IGNORE
++reorder-after <U013F>
+<L-j> <lj>;<BAS>;<CAP-MIN>;IGNORE
+<L-J> <lj>;<BAS>;<CAP>;IGNORE
+
+reorder-after <U014B>
+<n-j> <nj>;<BAS>;<MIN>;IGNORE
+<n-J> <nj>;<BAS>;<MIN-CAP>;IGNORE
++reorder-after <U014A>
+<N-j> <nj>;<BAS>;<CAP-MIN>;IGNORE
+<N-J> <nj>;<BAS>;<CAP>;IGNORE
+
+reorder-after <U0073>
+<U0161> <scaron>;<BAS>;<MIN>;IGNORE
++reorder-after <U0053>
+<U0160> <scaron>;<BAS>;<CAP>;IGNORE
+
+reorder-after <U007A>
+<U017E> <zcaron>;<BAS>;<MIN>;IGNORE
++reorder-after <U005A>
+<U017D> <zcaron>;<BAS>;<CAP>;IGNORE
-order_end
@@ -21618,7 +21640,7 @@
collating-element <D-Z'> from "<U0044><U0179>"
collating-element <D-z'> from "<U0044><U017A>"
collating-element <d-Z'> from "<U0064><U0179>"
-@@ -44,2081 +51,111 @@
+@@ -44,2081 +51,122 @@
collating-element <c-H> from "<U0063><U0048>"
collating-element <c-h> from "<U0063><U0068>"
@@ -21676,53 +21698,64 @@
+reorder-after <z>
+<zcaron>
+
++reorder-after <U010B>
++<U010D> <ccaron>;<PCT>;<MIN>;IGNORE
+reorder-after <U010A>
-+<U010D> <ccaron>;<PCT>;<MIN>;IGNORE
+<U010C> <ccaron>;<PCT>;<CAP>;IGNORE
+
++reorder-after <U0111>
++<d-z'> <d-z-sh>;<BAS>;<MIN>;IGNORE
++<d-Z'> <d-z-sh>;<BAS>;<MIN-CAP>;IGNORE
+reorder-after <U0110>
++<D-z'> <d-z-sh>;<BAS>;<CAP-MIN>;IGNORE
+<D-Z'> <d-z-sh>;<BAS>;<CAP>;IGNORE
-+<D-z'> <d-z-sh>;<BAS>;<CAP-MIN>;IGNORE
-+<d-Z'> <d-z-sh>;<BAS>;<MIN-CAP>;IGNORE
-+<d-z'> <d-z-sh>;<BAS>;<MIN>;IGNORE
+
++reorder-after <U0113>
++<U011B> <ecaron>;<BAS>;<MIN>;IGNORE
+reorder-after <U0112>
+<U011A> <ecaron>;<BAS>;<CAP>;IGNORE
-+<U011B> <ecaron>;<BAS>;<MIN>;IGNORE
+
++reorder-after <U0127>
++<c-h> <ch>;<BAS>;<MIN>;IGNORE
++<c-H> <ch>;<BAS>;<MIN-CAP>;IGNORE
+reorder-after <U0126>
++<C-h> <ch>;<BAS>;<CAP-MIN>;IGNORE
+<C-H> <ch>;<BAS>;<CAP>;IGNORE
-+<C-h> <ch>;<BAS>;<CAP-MIN>;IGNORE
-+<c-H> <ch>;<BAS>;<MIN-CAP>;IGNORE
-+<c-h> <ch>;<BAS>;<MIN>;IGNORE
+
++reorder-after <U0137>
++<U0142> <lstroke>;<BAS>;<MIN>;IGNORE
+reorder-after <U0136>
+<U0141> <lstroke>;<BAS>;<CAP>;IGNORE
-+<U0142> <lstroke>;<BAS>;<MIN>;IGNORE
+
++reorder-after <U0146>
++<U0144> <nacute>;<BAS>;<MIN>;IGNORE
+reorder-after <U0145>
+<U0143> <nacute>;<BAS>;<CAP>;IGNORE
-+<U0144> <nacute>;<BAS>;<MIN>;IGNORE
+
++reorder-after <U006F>
++<U00F3> <oacute>;<BAS>;<MIN>;IGNORE
+reorder-after <U004F>
+<U00D3> <oacute>;<BAS>;<CAP>;IGNORE
-+<U00F3> <oacute>;<BAS>;<MIN>;IGNORE
+
++reorder-after <U0157>
++<U0159> <rcaron>;<BAS>;<MIN>;IGNORE
+reorder-after <U0156>
+<U0158> <rcaron>;<BAS>;<CAP>;IGNORE
-+<U0159> <rcaron>;<BAS>;<MIN>;IGNORE
+
++reorder-after <U015F>
++<U0161> <scaron>;<BAS>;<MIN>;IGNORE
+reorder-after <U015E>
+<U0160> <scaron>;<BAS>;<CAP>;IGNORE
-+<U0161> <scaron>;<BAS>;<MIN>;IGNORE
+
++reorder-after <U0163>
++<U0107> <cacute>;<BAS>;<MIN>;IGNORE
+reorder-after <U0162>
+<U0106> <cacute>;<BAS>;<CAP>;IGNORE
-+<U0107> <cacute>;<BAS>;<MIN>;IGNORE
+
++reorder-after <U017C>
++<U017E> <zcaron>;<BAS>;<MIN>;IGNORE
+reorder-after <U017B>
+<U017D> <zcaron>;<BAS>;<CAP>;IGNORE
-+<U017E> <zcaron>;<BAS>;<MIN>;IGNORE
-% Ordering algorithm:
-% 1. Spaces and hyphen (but not soft
@@ -25935,7 +25968,7 @@
===================================================================
--- localedata/locales/pl_PL.orig
+++ localedata/locales/pl_PL
-@@ -48,2067 +48,78 @@
+@@ -48,2067 +48,86 @@
END LC_IDENTIFICATION
LC_COLLATE
@@ -25979,36 +26012,44 @@
+
+reorder-after <U0061>
+<U0105> <aogonek>;<BAS>;<MIN>;IGNORE
++reorder-after <U0041>
+<U0104> <aogonek>;<BAS>;<CAP>;IGNORE
+
+reorder-after <U0063>
+<U0107> <cacute>;<BAS>;<MIN>;IGNORE
++reorder-after <U0043>
+<U0106> <cacute>;<BAS>;<CAP>;IGNORE
+
+reorder-after <U0065>
+<U0119> <eogonek>;<BAS>;<MIN>;IGNORE
++reorder-after <U0045>
+<U0118> <eogonek>;<BAS>;<CAP>;IGNORE
+
+reorder-after <U006C>
+<U0142> <lstroke>;<BAS>;<MIN>;IGNORE
++reorder-after <U004C>
+<U0141> <lstroke>;<BAS>;<CAP>;IGNORE
+
+reorder-after <U006E>
+<U0144> <nacute>;<BAS>;<MIN>;IGNORE
++reorder-after <U004E>
+<U0143> <nacute>;<BAS>;<CAP>;IGNORE
+
+reorder-after <U006F>
+<U00F3> <oacute>;<BAS>;<MIN>;IGNORE
++reorder-after <U004F>
+<U00D3> <oacute>;<BAS>;<CAP>;IGNORE
+
+reorder-after <U0073>
+<U015B> <sacute>;<BAS>;<MIN>;IGNORE
++reorder-after <U0053>
+<U015A> <sacute>;<BAS>;<CAP>;IGNORE
+
+reorder-after <U007A>
+<U017A> <zacute>;<BAS>;<MIN>;IGNORE
++<U017C> <zdot>;<BAS>;<MIN>;IGNORE
++reorder-after <U005A>
+<U0179> <zacute>;<BAS>;<CAP>;IGNORE
-+<U017C> <zdot>;<BAS>;<MIN>;IGNORE
+<U017B> <zdot>;<BAS>;<CAP>;IGNORE
-% Ordering algorithm:
@@ -28077,7 +28118,7 @@
===================================================================
--- localedata/locales/sl_SI.orig
+++ localedata/locales/sl_SI
-@@ -48,2067 +48,34 @@
+@@ -48,2067 +48,37 @@
END LC_IDENTIFICATION
LC_COLLATE
@@ -28128,6 +28169,7 @@
-collating-symbol <SMALL>
+reorder-after <U0063>
+<U010D> <ccaron>;<BAS>;<MIN>;IGNORE
++reorder-after <U0043>
+<U010C> <ccaron>;<BAS>;<CAP>;IGNORE
-% <CAPITAL-SMALL> and <SMALL-CAPITAL>
@@ -28136,6 +28178,7 @@
-% as one letter.
+reorder-after <U0073>
+<U0161> <scaron>;<BAS>;<MIN>;IGNORE
++reorder-after <U0053>
+<U0160> <scaron>;<BAS>;<CAP>;IGNORE
-% The <a8> ...... <z8> collating
@@ -28149,6 +28192,7 @@
-% in an ordering of a character.
+reorder-after <U007A>
+<U017E> <zcaron>;<BAS>;<MIN>;IGNORE
++reorder-after <U005A>
+<U017D> <zcaron>;<BAS>;<CAP>;IGNORE
-collating-symbol <a8>
@@ -30169,7 +30213,7 @@
===================================================================
--- localedata/locales/tr_TR.orig
+++ localedata/locales/tr_TR
-@@ -61,2067 +61,62 @@
+@@ -61,2067 +61,67 @@
END LC_IDENTIFICATION
LC_COLLATE
@@ -30204,28 +30248,33 @@
+
+reorder-after <U0043>
+<U00C7> <c-cedilla>;<BAS>;<CAP>;IGNORE
++reorder-after <U0063>
+<U00E7> <c-cedilla>;<BAS>;<MIN>;IGNORE
+
+reorder-after <U0047>
+<U011E> <g-breve>;<BAS>;<CAP>;IGNORE
++reorder-after <U0067>
+<U011F> <g-breve>;<BAS>;<MIN>;IGNORE
+
++reorder-after <U0126>
++<U0049> <dotless-i>;<BAS>;<CAP>;IGNORE
++<U0130> <i>;<BAS>;<CAP>;IGNORE
+reorder-after <U0127>
+<U0131> <dotless-i>;<BAS>;<MIN>;IGNORE
-+<U0049> <dotless-i>;<BAS>;<CAP>;IGNORE
-+reorder-after <U0069>
-+<U0130> <i>;<BAS>;<CAP>;IGNORE
+
+reorder-after <U004F>
+<U00D6> <o-diaeresis>;<BAS>;<CAP>;IGNORE
++reorder-after <U006F>
+<U00F6> <o-diaeresis>;<BAS>;<MIN>;IGNORE
+
+reorder-after <U0053>
+<U015E> <s-cedilla>;<BAS>;<CAP>;IGNORE
++reorder-after <U0073>
+<U015F> <s-cedilla>;<BAS>;<MIN>;IGNORE
+
+reorder-after <U0055>
+<U00DC> <u-diaeresis>;<BAS>;<CAP>;IGNORE
++reorder-after <U0075>
+<U00FC> <u-diaeresis>;<BAS>;<MIN>;IGNORE
-% Base collation scheme: 1994-03-22
Modified: glibc-package/trunk/debian/patches/series
===================================================================
--- glibc-package/trunk/debian/patches/series 2006-06-05 22:39:01 UTC (rev 1620)
+++ glibc-package/trunk/debian/patches/series 2006-06-05 23:02:25 UTC (rev 1621)
@@ -39,6 +39,7 @@
localedata/locale-ia.diff
localedata/locale-zh_TW.diff -p0
localedata/new-valencian-locale.diff
+localedata/locale-se_NO.diff
localedata/tailor-iso14651_t1.diff -p0
localedata/fix-lang.diff
localedata/fix-unknown-symbols.diff
Reply to: