← Back to branch summary

~ubuntu-branches/ubuntu/jaunty/belocs-locales-data/jaunty

« back to all changes in this revision

Viewing changes to debian/patches/bz672_include_iso14651_t1_LC_COLLATE.diff

  • Committer: Bazaar Package Importer
  • Author(s): Denis Barbier
  • Date: 2006-06-08 22:00:09 UTC
  • mfrom: (1.1.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20060608220009-xbiuiampv18ok4u9
Tags: 2.4-2
* Modified patches:
  + bz672_include_iso14651_t1_LC_COLLATE.diff
  + include_iso14651_t1_others.diff
    Fix <MIN> and <CAP> collation for several locales.  This is needed so
    that character ranges work as expected, see #362514 for instance.

* New patches:
  + fix_ro_RO_mincap.diff
  + fix_se_NO_mincap.diff
    Some fixes for <MIN> and <CAP> collation.

* Move locale selection from belocs-locales-data into belocs-locales-bin.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/bz672_include_iso14651_t1_LC_COLLATE.diff
13
13
 
14
14
Index: localedata/locales/ca_ES
15
15
===================================================================
16
 
RCS file: /cvs/glibc/libc/localedata/locales/ca_ES,v
17
 
retrieving revision 1.15
18
 
diff -u -r1.15 ca_ES
19
 
--- localedata/locales/ca_ES    31 Oct 2004 23:42:26 -0000      1.15
20
 
+++ localedata/locales/ca_ES    16 Jan 2005 08:00:15 -0000
 
16
--- localedata/locales/ca_ES.orig       2005-10-14 19:50:06.000000000 +0200
 
17
+++ localedata/locales/ca_ES    2006-06-05 11:18:30.000000000 +0200
21
18
@@ -46,2067 +46,20 @@
22
19
 END LC_IDENTIFICATION
23
20
 
2097
2094
 
2098
2095
Index: localedata/locales/da_DK
2099
2096
===================================================================
2100
 
RCS file: /cvs/glibc/libc/localedata/locales/da_DK,v
2101
 
retrieving revision 1.14
2102
 
diff -u -r1.14 da_DK
2103
 
--- localedata/locales/da_DK    31 Oct 2004 23:42:26 -0000      1.14
2104
 
+++ localedata/locales/da_DK    16 Jan 2005 08:00:15 -0000
2105
 
@@ -55,2082 +55,78 @@
 
2097
--- localedata/locales/da_DK.orig       2004-11-01 00:42:26.000000000 +0100
 
2098
+++ localedata/locales/da_DK    2006-06-05 11:31:39.000000000 +0200
 
2099
@@ -55,2082 +55,83 @@
2106
2100
 END LC_IDENTIFICATION
2107
2101
 
2108
2102
 LC_COLLATE
2123
2117
+<CAP-MIN>
2124
2118
+<MIN-CAP>
2125
2119
+
 
2120
+reorder-after <OBL>
 
2121
+<ETH>
 
2122
+
2126
2123
+reorder-after <z>
2127
2124
+<ae>
2128
2125
+<o-stroke>
3610
3607
-<z8>
3611
3608
+reorder-after <U0178>
3612
3609
+<U00DC> <y>;<U00DC>;<CAP>;IGNORE
 
3610
+<U0170> <y>;<U0170>;<CAP>;IGNORE
 
3611
+reorder-after <U00FF>
3613
3612
+<U00FC> <y>;<U00DC>;<MIN>;IGNORE
3614
 
+<U0170> <y>;<U0170>;<CAP>;IGNORE
3615
3613
+<U0171> <y>;<U0170>;<MIN>;IGNORE
3616
3614
+
3617
3615
 % <U00C6> is a separate letter in Danish
3625
3623
-<U00E4>        <U00C6>;<SPECIAL>;<SMALL>;IGNORE
3626
3624
+reorder-after <U017B>
3627
3625
+<U00C6> <ae>;<BAS>;<CAP>;IGNORE
3628
 
+<U00E6> <ae>;<BAS>;<MIN>;IGNORE
3629
3626
+<U01FC> <ae>;<ACA>;<CAP>;IGNORE
3630
 
+<U01FD> <ae>;<ACA>;<MIN>;IGNORE
3631
3627
+<U00C4> <ae>;<REU>;<CAP>;IGNORE
3632
 
+<U00E4> <ae>;<REU>;<MIN>;IGNORE
3633
3628
+<U01E2> <ae>;<MAC>;<CAP>;IGNORE
3634
 
+<U01E3> <ae>;<MAC>;<MIN>;IGNORE
3635
3629
 % <U00D8> is a separate letter in Danish
3636
3630
-<U00D8>        <U00D8>;<NONE>;<CAPITAL>;IGNORE
3637
3631
-<U00F8>        <U00D8>;<NONE>;<SMALL>;IGNORE
3642
3636
-<U0150>        <U00D8>;<DOUBLE-ACUTE>;<CAPITAL>;IGNORE
3643
3637
-<U0151>        <U00D8>;<DOUBLE-ACUTE>;<SMALL>;IGNORE
3644
3638
+<U00D8> <o-stroke>;<BAS>;<CAP>;IGNORE
3645
 
+<U00F8> <o-stroke>;<BAS>;<MIN>;IGNORE
3646
3639
+<U01FE> <o-stroke>;<ACA>;<CAP>;IGNORE
3647
 
+<U01FF> <o-stroke>;<ACA>;<MIN>;IGNORE
3648
3640
+<U00D6> <o-stroke>;<REU>;<CAP>;IGNORE
3649
 
+<U00F6> <o-stroke>;<REU>;<MIN>;IGNORE
3650
3641
+<U0150> <o-stroke>;<DAC>;<CAP>;IGNORE
3651
 
+<U0151> <o-stroke>;<DAC>;<MIN>;IGNORE
3652
3642
 % <U00C5> is a separate letter in Danish
3653
3643
-<U00C5>        <U00C5>;<NONE>;<CAPITAL>;IGNORE
3654
3644
-<U00E5>        <U00C5>;<NONE>;<SMALL>;IGNORE
4222
4212
-
4223
4213
-order_end
4224
4214
+<U00C5> <a-ring>;<BAS>;<CAP>;IGNORE
4225
 
+<U00E5> <a-ring>;<BAS>;<MIN>;IGNORE
4226
4215
+<A-A>   <a-ring>;<A-A>;<CAP>;IGNORE
4227
4216
+<A-a>   <a-ring>;<A-A>;<CAP-MIN>;IGNORE
 
4217
+
 
4218
+reorder-after <U017C>
 
4219
+<U00E6> <ae>;<BAS>;<MIN>;IGNORE
 
4220
+<U01FD> <ae>;<ACA>;<MIN>;IGNORE
 
4221
+<U00E4> <ae>;<REU>;<MIN>;IGNORE
 
4222
+<U01E3> <ae>;<MAC>;<MIN>;IGNORE
 
4223
+<U00F8> <o-stroke>;<BAS>;<MIN>;IGNORE
 
4224
+<U01FF> <o-stroke>;<ACA>;<MIN>;IGNORE
 
4225
+<U00F6> <o-stroke>;<REU>;<MIN>;IGNORE
 
4226
+<U0151> <o-stroke>;<DAC>;<MIN>;IGNORE
 
4227
+<U00E5> <a-ring>;<BAS>;<MIN>;IGNORE
4228
4228
+<a-A>   <a-ring>;<A-A>;<MIN-CAP>;IGNORE
4229
4229
+<a-a>   <a-ring>;<A-A>;<MIN>;IGNORE
4230
4230
+
4232
4232
+%  removed from latest iso14651 tables.
4233
4233
+reorder-after <U0162>
4234
4234
+<U00DE> "<t><h>";"<LIG><LIG>";"<CAP><CAP>";IGNORE
 
4235
+reorder-after <U0163>
4235
4236
+<U00FE> "<t><h>";"<LIG><LIG>";"<MIN><MIN>";IGNORE
4236
4237
+
4237
 
+reorder-after <OBL>
4238
 
+<ETH>
4239
 
+
4240
4238
+reorder-after <U0064>
4241
4239
+<U0110> <d>;<OBL>;<CAP>;IGNORE
 
4240
+<U00D0> <d>;<ETH>;<CAP>;IGNORE
 
4241
+reorder-after <U0044>
4242
4242
+<U0111> <d>;<OBL>;<MIN>;IGNORE
4243
 
+<U00D0> <d>;<ETH>;<CAP>;IGNORE
4244
4243
+<U00F0> <d>;<ETH>;<MIN>;IGNORE
4245
4244
 
4246
4245
+reorder-end
4249
4248
 LC_CTYPE
4250
4249
Index: localedata/locales/en_CA
4251
4250
===================================================================
4252
 
RCS file: /cvs/glibc/libc/localedata/locales/en_CA,v
4253
 
retrieving revision 1.14
4254
 
diff -u -r1.14 en_CA
4255
 
--- localedata/locales/en_CA    31 Oct 2004 23:42:26 -0000      1.14
4256
 
+++ localedata/locales/en_CA    16 Jan 2005 08:00:15 -0000
 
4251
--- localedata/locales/en_CA.orig       2004-11-01 00:42:26.000000000 +0100
 
4252
+++ localedata/locales/en_CA    2006-06-05 11:18:30.000000000 +0200
4257
4253
@@ -49,2067 +49,20 @@
4258
4254
 END LC_IDENTIFICATION
4259
4255
 
6334
6330
 
6335
6331
Index: localedata/locales/es_US
6336
6332
===================================================================
6337
 
RCS file: /cvs/glibc/libc/localedata/locales/es_US,v
6338
 
retrieving revision 1.13
6339
 
diff -u -r1.13 es_US
6340
 
--- localedata/locales/es_US    31 Oct 2004 23:42:26 -0000      1.13
6341
 
+++ localedata/locales/es_US    16 Jan 2005 08:00:15 -0000
 
6333
--- localedata/locales/es_US.orig       2005-09-30 02:02:09.000000000 +0200
 
6334
+++ localedata/locales/es_US    2006-06-05 11:18:30.000000000 +0200
6342
6335
@@ -48,6 +48,8 @@
6343
6336
 END LC_IDENTIFICATION
6344
6337
 
8466
8459
 
8467
8460
Index: localedata/locales/fi_FI
8468
8461
===================================================================
8469
 
RCS file: /cvs/glibc/libc/localedata/locales/fi_FI,v
8470
 
retrieving revision 1.18
8471
 
diff -u -r1.18 fi_FI
8472
 
--- localedata/locales/fi_FI    31 Oct 2004 23:42:26 -0000      1.18
8473
 
+++ localedata/locales/fi_FI    16 Jan 2005 08:00:16 -0000
8474
 
@@ -52,2068 +52,74 @@
 
8462
--- localedata/locales/fi_FI.orig       2006-01-02 21:00:57.000000000 +0100
 
8463
+++ localedata/locales/fi_FI    2006-06-05 11:27:11.000000000 +0200
 
8464
@@ -52,2068 +52,79 @@
8475
8465
 END LC_IDENTIFICATION
8476
8466
 
8477
8467
 LC_COLLATE
8487
8477
+<a-diaerisis>
8488
8478
+<o-diaerisis>
8489
8479
+
 
8480
+reorder-after <U007A>
 
8481
+<U00E5> <a-ring>;<BAS>;<MIN>;IGNORE
 
8482
+<U01FB> <a-ring>;<ACA>;<MIN>;IGNORE
 
8483
+<U00E4> <a-diaerisis>;<BAS>;<MIN>;IGNORE
 
8484
+<U00E6> <a-diaerisis>;<REU>;<MIN>;IGNORE
 
8485
+<U01FD> <a-diaerisis>;<U01FD>;<MIN>;IGNORE
 
8486
+<U01E3> <a-diaerisis>;<MAC>;<MIN>;IGNORE
 
8487
+<U00F6> <o-diaerisis>;<BAS>;<MIN>;IGNORE
 
8488
+<U00F8> <o-diaerisis>;<U00D8>;<MIN>;IGNORE
 
8489
+<U01FF> <o-diaerisis>;<U01FF>;<MIN>;IGNORE
 
8490
+<U00F5> <o-diaerisis>;<TIL>;<MIN>;IGNORE
8490
8491
+reorder-after <U005A>
8491
 
+<U00E5> <a-ring>;<BAS>;<MIN>;IGNORE
8492
8492
+<U00C5> <a-ring>;<BAS>;<CAP>;IGNORE
8493
 
+<U01FB> <a-ring>;<ACA>;<MIN>;IGNORE
8494
8493
+<U01FA> <a-ring>;<ACA>;<CAP>;IGNORE
8495
 
+<U00E4> <a-diaerisis>;<BAS>;<MIN>;IGNORE
8496
8494
+<U00C4> <a-diaerisis>;<BAS>;<CAP>;IGNORE
8497
 
+<U00E6> <a-diaerisis>;<REU>;<MIN>;IGNORE
8498
8495
+<U00C6> <a-diaerisis>;<REU>;<CAP>;IGNORE
8499
 
+<U01FD> <a-diaerisis>;<U01FD>;<MIN>;IGNORE
8500
8496
+<U01FC> <a-diaerisis>;<U01FD>;<CAP>;IGNORE
8501
 
+<U01E3> <a-diaerisis>;<MAC>;<MIN>;IGNORE
8502
8497
+<U01E2> <a-diaerisis>;<MAC>;<CAP>;IGNORE
8503
 
+<U00F6> <o-diaerisis>;<BAS>;<MIN>;IGNORE
8504
8498
+<U00D6> <o-diaerisis>;<BAS>;<CAP>;IGNORE
8505
 
+<U00F8> <o-diaerisis>;<U00D8>;<MIN>;IGNORE
8506
8499
+<U00D8> <o-diaerisis>;<U00D8>;<CAP>;IGNORE
8507
 
+<U01FF> <o-diaerisis>;<U01FF>;<MIN>;IGNORE
8508
8500
+<U01FE> <o-diaerisis>;<U01FF>;<CAP>;IGNORE
8509
 
+<U00F5> <o-diaerisis>;<TIL>;<MIN>;IGNORE
8510
8501
+<U00D5> <o-diaerisis>;<TIL>;<CAP>;IGNORE
8511
8502
+
 
8503
+reorder-after <U016B>
 
8504
+<U0076> <v>;<U0056>;<BAS>;<MIN>
 
8505
+<U1E7D> <v>;<U0056>;<TIL>;<MIN>
 
8506
+<U0077> <w>;<U0057>;<BAS>;<MIN>
 
8507
+<U1E83> <w>;<U0057>;<ACA>;<MIN>
 
8508
+<U1E81> <w>;<U0057>;<GRA>;<MIN>
 
8509
+<U0175> <w>;<U0057>;<CIR>;<MIN>
 
8510
+<U1E85> <w>;<U0057>;<REU>;<MIN>
 
8511
+<U1E87> <w>;<U0057>;<PCT>;<MIN>
8512
8512
+reorder-after <U016A>
8513
 
+<U0076> <v>;<U0056>;<BAS>;<MIN>
8514
8513
+<U0056> <v>;<U0056>;<BAS>;<CAP>
8515
 
+<U1E7D> <v>;<U0056>;<TIL>;<MIN>
8516
8514
+<U1E7C> <v>;<U0056>;<TIL>;<CAP>
8517
 
+<U0077> <w>;<U0057>;<BAS>;<MIN>
8518
8515
+<U0057> <w>;<U0057>;<BAS>;<CAP>
8519
 
+<U1E83> <w>;<U0057>;<ACA>;<MIN>
8520
8516
+<U1E82> <w>;<U0057>;<ACA>;<CAP>
8521
 
+<U1E81> <w>;<U0057>;<GRA>;<MIN>
8522
8517
+<U1E80> <w>;<U0057>;<GRA>;<CAP>
8523
 
+<U0175> <w>;<U0057>;<CIR>;<MIN>
8524
8518
+<U0174> <w>;<U0057>;<CIR>;<CAP>
8525
 
+<U1E85> <w>;<U0057>;<REU>;<MIN>
8526
8519
+<U1E84> <w>;<U0057>;<REU>;<CAP>
8527
 
+<U1E87> <w>;<U0057>;<PCT>;<MIN>
8528
8520
+<U1E86> <w>;<U0057>;<PCT>;<CAP>
8529
8521
+
8530
8522
+reorder-after <U00FF>
8531
8523
+<U00FC> <y>;<DTT>;<MIN>;IGNORE
 
8524
+reorder-after <U0178>
8532
8525
+<U00DC> <y>;<DTT>;<CAP>;IGNORE
8533
8526
+
8534
8527
+%  Present in iso14651_t1, but these definitions seem to have been
8535
8528
+%  removed from latest iso14651 tables.
 
8529
+reorder-after <U0163>
 
8530
+<U00FE> "<t><h>";"<LIG><LIG>";"<MIN><MIN>";IGNORE
8536
8531
+reorder-after <U0162>
8537
 
+<U00FE> "<t><h>";"<LIG><LIG>";"<MIN><MIN>";IGNORE
8538
8532
+<U00DE> "<t><h>";"<LIG><LIG>";"<CAP><CAP>";IGNORE
8539
8533
+
8540
8534
+reorder-after <U0064>
8541
8535
+<U00F0> <d>;<PCL>;<MIN>;IGNORE
 
8536
+<U0111> <d>;<OBL>;<MIN>;IGNORE
 
8537
+reorder-after <U0044>
8542
8538
+<U00D0> <d>;<PCL>;<CAP>;IGNORE
8543
 
+<U0111> <d>;<OBL>;<MIN>;IGNORE
8544
8539
+<U0110> <d>;<OBL>;<CAP>;IGNORE
8545
8540
 
8546
8541
-% Ordering algorithm:
10608
10603
 
10609
10604
Index: localedata/locales/nb_NO
10610
10605
===================================================================
10611
 
RCS file: /cvs/glibc/libc/localedata/locales/nb_NO,v
10612
 
retrieving revision 1.5
10613
 
diff -u -r1.5 nb_NO
10614
 
--- localedata/locales/nb_NO    31 Oct 2004 23:42:27 -0000      1.5
10615
 
+++ localedata/locales/nb_NO    16 Jan 2005 08:00:16 -0000
10616
 
@@ -48,2078 +48,74 @@
 
10606
--- localedata/locales/nb_NO.orig       2004-11-01 00:42:27.000000000 +0100
 
10607
+++ localedata/locales/nb_NO    2006-06-05 11:32:58.000000000 +0200
 
10608
@@ -48,2078 +48,78 @@
10617
10609
 END LC_IDENTIFICATION
10618
10610
 
10619
10611
 LC_COLLATE
10634
10626
+<CAP-MIN>
10635
10627
+<MIN-CAP>
10636
10628
+
 
10629
+reorder-after <OBL>
 
10630
+<ETH>
 
10631
+
10637
10632
+reorder-after <z>
10638
10633
+<ae>
10639
10634
+<o-stroke>
10641
10636
+
10642
10637
+reorder-after <U0178>
10643
10638
+<U00DC> <y>;<U00DC>;<CAP>;IGNORE
 
10639
+<U0170> <y>;<U0170>;<CAP>;IGNORE
 
10640
+reorder-after <U00FF>
10644
10641
+<U00FC> <y>;<U00DC>;<MIN>;IGNORE
10645
 
+<U0170> <y>;<U0170>;<CAP>;IGNORE
10646
10642
+<U0171> <y>;<U0170>;<MIN>;IGNORE
10647
10643
+
10648
10644
+reorder-after <U017B>
10649
10645
+<U00C6> <ae>;<BAS>;<CAP>;IGNORE
10650
 
+<U00E6> <ae>;<BAS>;<MIN>;IGNORE
10651
10646
+<U01FC> <ae>;<ACA>;<CAP>;IGNORE
10652
 
+<U01FD> <ae>;<ACA>;<MIN>;IGNORE
10653
10647
+<U01E2> <ae>;<MAC>;<CAP>;IGNORE
10654
 
+<U01E3> <ae>;<MAC>;<MIN>;IGNORE
10655
10648
+<U00C4> <ae>;<PCL>;<CAP>;IGNORE
 
10649
+<U00D8> <o-stroke>;<BAS>;<CAP>;IGNORE
 
10650
+<U01FE> <o-stroke>;<ACA>;<CAP>;IGNORE
 
10651
+<U00D6> <o-stroke>;<REU>;<CAP>;IGNORE
 
10652
+<U0150> <o-stroke>;<DAC>;<CAP>;IGNORE
 
10653
+<U00C5> <a-ring>;<BAS>;<CAP>;IGNORE
 
10654
+<A-A>   <a-ring>;<A-A>;<CAP>;IGNORE
 
10655
+<A-a>   <a-ring>;<A-A>;<CAP-MIN>;IGNORE
 
10656
+reorder-after <U017C>
 
10657
+<U00E6> <ae>;<BAS>;<MIN>;IGNORE
 
10658
+<U01FD> <ae>;<ACA>;<MIN>;IGNORE
 
10659
+<U01E3> <ae>;<MAC>;<MIN>;IGNORE
10656
10660
+<U00E4> <ae>;<PCL>;<MIN>;IGNORE
10657
 
+<U00D8> <o-stroke>;<BAS>;<CAP>;IGNORE
10658
10661
+<U00F8> <o-stroke>;<BAS>;<MIN>;IGNORE
10659
 
+<U01FE> <o-stroke>;<ACA>;<CAP>;IGNORE
10660
10662
+<U01FF> <o-stroke>;<ACA>;<MIN>;IGNORE
10661
 
+<U00D6> <o-stroke>;<REU>;<CAP>;IGNORE
10662
10663
+<U00F6> <o-stroke>;<REU>;<MIN>;IGNORE
10663
 
+<U0150> <o-stroke>;<DAC>;<CAP>;IGNORE
10664
10664
+<U0151> <o-stroke>;<DAC>;<MIN>;IGNORE
10665
 
+<U00C5> <a-ring>;<BAS>;<CAP>;IGNORE
10666
10665
+<U00E5> <a-ring>;<BAS>;<MIN>;IGNORE
10667
 
+<A-A>   <a-ring>;<A-A>;<CAP>;IGNORE
10668
 
+<A-a>   <a-ring>;<A-A>;<CAP-MIN>;IGNORE
10669
10666
+<a-A>   <a-ring>;<A-A>;<MIN-CAP>;IGNORE
10670
10667
+<a-a>   <a-ring>;<A-A>;<MIN>;IGNORE
10671
10668
+
10673
10670
+%  removed from latest iso14651 tables.
10674
10671
+reorder-after <U0162>
10675
10672
+<U00DE> "<t><h>";"<LIG><LIG>";"<CAP><CAP>";IGNORE
 
10673
+reorder-after <U0163>
10676
10674
+<U00FE> "<t><h>";"<LIG><LIG>";"<MIN><MIN>";IGNORE
10677
10675
+
10678
 
+reorder-after <OBL>
10679
 
+<ETH>
10680
 
+
10681
10676
+reorder-after <U0064>
10682
10677
+<U0110> <d>;<OBL>;<CAP>;IGNORE
 
10678
+<U00D0> <d>;<ETH>;<CAP>;IGNORE
 
10679
+reorder-after <U0044>
10683
10680
+<U0111> <d>;<OBL>;<MIN>;IGNORE
10684
 
+<U00D0> <d>;<ETH>;<CAP>;IGNORE
10685
10681
+<U00F0> <d>;<ETH>;<MIN>;IGNORE
10686
10682
 
10687
10683
-% Base collation scheme: 1994-03-22