- merged from AC-branch

Changed files:
    glibc-locale_fixes.patch -> 1.13
    glibc-morelocales.patch -> 1.36
    glibc-sr_CS.patch -> 1.6

diff --git a/glibc-locale_fixes.patch b/glibc-locale_fixes.patch
index caa694b09d84f0202cafbb9ac6c0f33a78c72b6b..65b48ddc420d673227d2eb25d048219202d0f9af 100644 (file)
--- a/glibc-locale_fixes.patch
+++ b/glibc-locale_fixes.patch
@@ -4137,67 +4137,6 @@ diff -uNr libc.orig/localedata/locales/sq_AL libc/localedata/locales/sq_AL
 diff -uNr libc.orig/localedata/locales/sr_CS libc/localedata/locales/sr_CS
 --- libc.orig/localedata/locales/sr_CS 2004-11-10 01:45:57.000000000 +0100
 +++ libc/localedata/locales/sr_CS      2004-11-10 02:36:38.000000000 +0100
-@@ -11,8 +11,8 @@
- % Fax: none
- % Language: sr
- % Territory: CS
--% Revision: 1.0
--% Date: 2003-08-13
-+% Revision: 1.2
-+% Date: 2004-08-09
- % Application: general
- % Users: general
- % Charset: UTF-8, ISO-8859-5
-@@ -33,24 +33,24 @@
- fax        ""
- language   "Serbian"
- territory  "Serbia and Montenegro"
--revision   "1.1"
--date       "2004-01-10"
-+revision   "1.2"
-+date       "2004-08-09"
- audience   "general"
- application   "GNU locale"
- abbreviation  ""
- %
--category  i18n:1997;LC_IDENTIFICATION
--category  i18n:1997;LC_CTYPE
--category  i18n:1997;LC_COLLATE
--category  i18n:1997;LC_MONETARY
--category  i18n:1997;LC_NUMERIC
--category  i18n:1997;LC_TIME
--category  i18n:1997;LC_MESSAGES
--category  i18n:1997;LC_PAPER
--category  i18n:1997;LC_NAME
--category  i18n:1997;LC_ADDRESS
--category  i18n:1997;LC_TELEPHONE
--category  i18n:1997;LC_MEASUREMENT
-+category  "i18n:1997";LC_IDENTIFICATION
-+category  "i18n:1997";LC_CTYPE
-+category  "i18n:1997";LC_COLLATE
-+category  "i18n:1997";LC_MONETARY
-+category  "i18n:1997";LC_NUMERIC
-+category  "i18n:1997";LC_TIME
-+category  "i18n:1997";LC_MESSAGES
-+category  "i18n:1997";LC_PAPER
-+category  "i18n:1997";LC_NAME
-+category  "i18n:1997";LC_ADDRESS
-+category  "i18n:1997";LC_TELEPHONE
-+category  "i18n:1997";LC_MEASUREMENT
- END LC_IDENTIFICATION
- 
- LC_CTYPE
-@@ -295,8 +295,8 @@
- END LC_TIME
- 
- LC_MESSAGES
--yesexpr "<U005B><U0414><U0434><U0044><U0064><U0059><U0079><U005D><U002E><U002A>"
--noexpr  "<U005B><U041D><U043D><U004E><U006E><U005D><U002E><U002A>"
-+yesexpr "<U005E><U005B><U0414><U0434><U0044><U0064><U0059><U0079><U005D>"
-+noexpr  "<U005E><U005B><U041D><U043D><U004E><U006E><U005D>"
- END LC_MESSAGES
- 
- LC_PAPER
 @@ -328,7 +328,6 @@
  <U0020><U0426><U0440><U043D><U0430><U0020><U0413><U043E><U0440><U0430>"
  country_num   891

diff --git a/glibc-morelocales.patch b/glibc-morelocales.patch
index 7f57731b7b361adab15c4cb0542e931ea05f396c..cac10aa2ca2bbacde23a91469d4de62461193cf1 100644 (file)
--- a/glibc-morelocales.patch
+++ b/glibc-morelocales.patch
@@ -34,23 +34,7 @@ diff -uNr libc.old/intl/locale.alias libc/intl/locale.alias
 diff -uNr libc.old/localedata/SUPPORTED libc/localedata/SUPPORTED
 --- libc.old/localedata/SUPPORTED      2004-09-10 09:30:22.000000000 +0200
 +++ libc/localedata/SUPPORTED  2004-09-10 09:29:21.000000000 +0200
-@@ -2,12 +2,15 @@
- # If you have any additions please use the glibcbug script to send an
- # appropriate message.
- SUPPORTED-LOCALES=\
-+aa_DJ.UTF-8/UTF-8 \
- aa_DJ/ISO-8859-1 \
- aa_ER/UTF-8 \
- aa_ER@saaho/UTF-8 \
- aa_ET/UTF-8 \
-+af_ZA.UTF-8/UTF-8 \
- af_ZA/ISO-8859-1 \
- am_ET/UTF-8 \
-+an_ES.UTF-8/UTF-8 \
- an_ES/ISO-8859-15 \
- ar_AE.UTF-8/UTF-8 \
- ar_AE/ISO-8859-6 \
-@@ -44,15 +47,18 @@
+@@ -46,7 +46,8 @@
  ar_TN/ISO-8859-6 \
  ar_YE.UTF-8/UTF-8 \
  ar_YE/ISO-8859-6 \
@@ -60,17 +44,7 @@ diff -uNr libc.old/localedata/SUPPORTED libc/localedata/SUPPORTED
  be_BY.UTF-8/UTF-8 \
  be_BY/CP1251 \
  bg_BG.UTF-8/UTF-8 \
- bg_BG/CP1251 \
- bn_BD/UTF-8 \
- bn_IN/UTF-8 \
-+br_FR.UTF-8/UTF-8 \
- br_FR/ISO-8859-1 \
- br_FR@euro/ISO-8859-15 \
-+bs_BA.UTF-8/UTF-8 \
- bs_BA/ISO-8859-2 \
- byn_ER/UTF-8 \
- ca_ES.UTF-8/UTF-8 \
-@@ -60,6 +66,7 @@
+@@ -64,6 +65,7 @@
  ca_ES@euro/ISO-8859-15 \
  cs_CZ.UTF-8/UTF-8 \
  cs_CZ/ISO-8859-2 \
@@ -78,7 +52,7 @@ diff -uNr libc.old/localedata/SUPPORTED libc/localedata/SUPPORTED
  cy_GB.UTF-8/UTF-8 \
  cy_GB/ISO-8859-14 \
  da_DK.UTF-8/UTF-8 \
-@@ -78,6 +85,8 @@
+@@ -82,6 +84,8 @@
  de_LU.UTF-8/UTF-8 \
  de_LU/ISO-8859-1 \
  de_LU@euro/ISO-8859-15 \
@@ -87,7 +61,7 @@ diff -uNr libc.old/localedata/SUPPORTED libc/localedata/SUPPORTED
  el_GR.UTF-8/UTF-8 \
  el_GR/ISO-8859-7 \
  en_AU.UTF-8/UTF-8 \
-@@ -159,6 +168,8 @@
+@@ -163,6 +167,8 @@
  fi_FI.UTF-8/UTF-8 \
  fi_FI/ISO-8859-1 \
  fi_FI@euro/ISO-8859-15 \
@@ -96,14 +70,6 @@ diff -uNr libc.old/localedata/SUPPORTED libc/localedata/SUPPORTED
  fo_FO.UTF-8/UTF-8 \
  fo_FO/ISO-8859-1 \
  fr_BE.UTF-8/UTF-8 \
-@@ -177,6 +187,7 @@
- ga_IE.UTF-8/UTF-8 \
- ga_IE/ISO-8859-1 \
- ga_IE@euro/ISO-8859-15 \
-+gd_GB.UTF-8/UTF-8 \
- gd_GB/ISO-8859-15 \
- gez_ER/UTF-8 \
- gez_ER@abegede/UTF-8 \
 @@ -190,11 +201,17 @@
  gv_GB/ISO-8859-1 \
  he_IL.UTF-8/UTF-8 \
@@ -122,7 +88,7 @@ diff -uNr libc.old/localedata/SUPPORTED libc/localedata/SUPPORTED
  id_ID.UTF-8/UTF-8 \
  id_ID/ISO-8859-1 \
  is_IS.UTF-8/UTF-8 \
-@@ -204,11 +221,13 @@
+@@ -204,10 +221,10 @@
  it_IT.UTF-8/UTF-8 \
  it_IT/ISO-8859-1 \
  it_IT@euro/ISO-8859-15 \
@@ -132,13 +98,10 @@ diff -uNr libc.old/localedata/SUPPORTED libc/localedata/SUPPORTED
  ja_JP.EUC-JP/EUC-JP \
  ja_JP.UTF-8/UTF-8 \
 +ka_GE.GEORGIAN-ACADEMY/GEORGIAN-ACADEMY \
-+ka_GE.UTF-8/UTF-8 \
+ ka_GE.UTF-8/UTF-8 \
  ka_GE/GEORGIAN-PS \
-+kk_KZ.UTF-8/UTF-8 \
- kk_KZ/PT154 \
- kl_GL.UTF-8/UTF-8 \
- kl_GL/ISO-8859-1 \
-@@ -215,14 +234,26 @@
+ kk_KZ.UTF-8/UTF-8 \
+@@ -215,10 +234,20 @@
  kn_IN/UTF-8 \
  ko_KR.EUC-KR/EUC-KR \
  ko_KR.UTF-8/UTF-8 \
@@ -147,7 +110,7 @@ diff -uNr libc.old/localedata/SUPPORTED libc/localedata/SUPPORTED
  kw_GB/ISO-8859-1 \
 +ky_KG.UTF-8/UTF-8 \
 +ky_KG/KOI8-K \
-+lg_UG.UTF-8/UTF-8 \
+ lg_UG.UTF-8/UTF-8 \
  lg_UG/ISO-8859-10 \
 +li_BE.UTF-8/UTF-8 \
 +li_BE/ISO-8859-1 \
@@ -159,12 +122,6 @@ diff -uNr libc.old/localedata/SUPPORTED libc/localedata/SUPPORTED
  lo_LA/UTF-8 \
  lt_LT.UTF-8/UTF-8 \
  lt_LT/ISO-8859-13 \
- lv_LV.UTF-8/UTF-8 \
- lv_LV/ISO-8859-13 \
-+mi_NZ.UTF-8/UTF-8 \
- mi_NZ/ISO-8859-13 \
- mk_MK.UTF-8/UTF-8 \
- mk_MK/ISO-8859-5 \
 @@ -235,6 +267,10 @@
  mt_MT/ISO-8859-3 \
  nb_NO.UTF-8/UTF-8 \
@@ -176,15 +133,14 @@ diff -uNr libc.old/localedata/SUPPORTED libc/localedata/SUPPORTED
  ne_NP/UTF-8 \
  nl_BE.UTF-8/UTF-8 \
  nl_BE/ISO-8859-1 \
-@@ -244,10 +280,18 @@
- nl_NL@euro/ISO-8859-15 \
+@@ -244,11 +280,17 @@
  nn_NO.UTF-8/UTF-8 \
  nn_NO/ISO-8859-1 \
-+oc_FR.UTF-8/UTF-8 \
+ oc_FR.UTF-8/UTF-8 \
 +oc_FR@euro/ISO-8859-15 \
  oc_FR/ISO-8859-1 \
  om_ET/UTF-8 \
-+om_KE.UTF-8/UTF-8 \
+ om_KE.UTF-8/UTF-8 \
  om_KE/ISO-8859-1 \
 +or_IN/UTF-8 \
  pa_IN/UTF-8 \
@@ -203,7 +159,7 @@ diff -uNr libc.old/localedata/SUPPORTED libc/localedata/SUPPORTED
  ro_RO.UTF-8/UTF-8 \
  ro_RO/ISO-8859-2 \
  ru_RU.KOI8-R/KOI8-R \
-@@ -262,22 +307,31 @@
+@@ -262,25 +307,31 @@
  ru_RU/ISO-8859-5 \
  ru_UA.UTF-8/UTF-8 \
  ru_UA/KOI8-U \
@@ -217,12 +173,12 @@ diff -uNr libc.old/localedata/SUPPORTED libc/localedata/SUPPORTED
 +sl_SI.ISO-8859-16/ISO-8859-16 \
  sl_SI.UTF-8/UTF-8 \
  sl_SI/ISO-8859-2 \
-+so_DJ.UTF-8/UTF-8 \
+ so_DJ.UTF-8/UTF-8 \
  so_DJ/ISO-8859-1 \
  so_ET/UTF-8 \
-+so_KE.UTF-8/UTF-8 \
+ so_KE.UTF-8/UTF-8 \
  so_KE/ISO-8859-1 \
-+so_SO.UTF-8/UTF-8 \
+ so_SO.UTF-8/UTF-8 \
  so_SO/ISO-8859-1 \
  sq_AL.UTF-8/UTF-8 \
  sq_AL/ISO-8859-1 \
@@ -235,12 +191,12 @@ diff -uNr libc.old/localedata/SUPPORTED libc/localedata/SUPPORTED
  st_ZA.UTF-8/UTF-8 \
  st_ZA/ISO-8859-1 \
  sv_FI.UTF-8/UTF-8 \
-@@ -287,28 +341,40 @@
+@@ -287,28 +341,37 @@
  sv_SE/ISO-8859-1 \
  ta_IN/UTF-8 \
  te_IN/UTF-8 \
 +tg_TJ.KOI8-K/KOI8-K \
-+tg_TJ.UTF-8/UTF-8 \
+ tg_TJ.UTF-8/UTF-8 \
  tg_TJ/KOI8-T \
 +th_TH.ISO-8859-11/ISO-8859-11 \
  th_TH.UTF-8/UTF-8 \
@@ -248,7 +204,7 @@ diff -uNr libc.old/localedata/SUPPORTED libc/localedata/SUPPORTED
  ti_ER/UTF-8 \
  ti_ET/UTF-8 \
  tig_ER/UTF-8 \
-+tl_PH.UTF-8/UTF-8 \
+ tl_PH.UTF-8/UTF-8 \
  tl_PH/ISO-8859-1 \
 +tr_CY.UTF-8/UTF-8 \
 +tr_CY/ISO-8859-9 \
@@ -273,10 +229,7 @@ diff -uNr libc.old/localedata/SUPPORTED libc/localedata/SUPPORTED
 +wal_ET/UTF-8 \
  xh_ZA.UTF-8/UTF-8 \
  xh_ZA/ISO-8859-1 \
-+yi_US.UTF-8/UTF-8 \
- yi_US/CP1255 \
- zh_CN.GB18030/GB18030 \
- zh_CN.GBK/GBK \
+ yi_US.UTF-8/UTF-8 \
 diff -uNr libc.old/localedata/locales/csb_PL libc/localedata/locales/csb_PL
 --- libc.old/localedata/locales/csb_PL 1970-01-01 01:00:00.000000000 +0100
 +++ libc/localedata/locales/csb_PL     2004-09-10 09:29:21.000000000 +0200
@@ -6913,9 +6866,8 @@ diff -uNr libc.old/localedata/locales/pap_AN@euro libc/localedata/locales/pap_AN
 +LC_ADDRESS
 +copy "pap_AN"
 +END LC_ADDRESS
-diff -uNr libc.old/localedata/locales/rw_RW libc/localedata/locales/rw_RW
---- libc.old/localedata/locales/rw_RW  2004-07-16 01:24:39.000000000 +0100
-+++ libc/localedata/locales/rw_RW      2004-11-14 03:07:27.000000000 +0200
+--- glibc-2.3-20051017/localedata/locales/rw_RW.orig   1970-01-01 01:00:00.000000000 +0100
++++ glibc-2.3-20051017/localedata/locales/rw_RW        2005-10-24 12:58:25.000000000 +0200
 @@ -0,0 +1,152 @@
 +escape_char /
 +comment_char %
@@ -6925,7 +6877,7 @@ diff -uNr libc.old/localedata/locales/rw_RW libc/localedata/locales/rw_RW
 +%  Mr. Safali
 +
 +LC_IDENTIFICATION
-+title      "Kinyarwanda locale for Rwanda"
++title      "Kinyarwanda language locale for Rwanda"
 +source     "Rwanda"
 +address    "Rwanda, Africa"
 +contact    "Steve Murphy"
@@ -7047,15 +6999,15 @@ diff -uNr libc.old/localedata/locales/rw_RW libc/localedata/locales/rw_RW
 +<U0020><U0025><U0068><U0020><U0025><U0065><U0020><U0025><U0072><U0025>/
 +<U004E><U0025><U0025><U007A><U0020><U0025><U0054><U0025>/
 +<U004E><U0025><U0063><U0025><U004E>"
-+country_name   "Rwanda"
-+country_ab2    "RW"
-+country_ab3    "RWA"
++country_name   "<U0052><U0077><U0061><U006E><U0064><U0061>"
++country_ab2    "<U0052><U0057>"
++country_ab3    "<U0052><U0057><U0041>"
 +country_num    646
-+country_car    "RWA"
-+lang_name      "Kinyarwanda"
-+lang_ab        "rw"
-+lang_term      "kin"
-+lang_lib       "kin"
++country_car    "<U0052><U0057><U0041>"
++lang_name      "<U004B><U0069><U006E><U0079><U0061><U0072><U0077><U0061><U006E><U0064><U0061>"
++lang_ab        "<U0072><U0077>"
++lang_term      "<U006B><U0069><U006E>"
++lang_lib       "<U006B><U0069><U006E>"
 +END LC_ADDRESS
 +
 +LC_TELEPHONE
@@ -7069,13 +7021,13 @@ diff -uNr libc.old/localedata/locales/rw_RW libc/localedata/locales/rw_RW
 +measurement    1
 +END LC_MEASUREMENT
 +
-diff -uNr libc.old/localedata/locales/si_LK libc/localedata/locales/si_LK
---- libc.old/localedata/locales/si_LK  1970-01-01 01:00:00.000000000 +0100
-+++ libc/localedata/locales/si_LK      2004-09-10 09:29:21.000000000 +0200
-@@ -0,0 +1,221 @@
+--- glibc-2.3-20051017/localedata/locales/si_LK.orig   1970-01-01 01:00:00.000000000 +0100
++++ glibc-2.3-20051017/localedata/locales/si_LK        2005-10-24 12:50:39.000000000 +0200
+@@ -0,0 +1,222 @@
 +escape_char  /
 +comment_char %
 +% Sinhala language locale for Sri Lanka.
++% Charset: UTF-8
 +% Contributed by Anuradha Ratnaweera <anuradha at gnu org>
 +% and Himira Ratnatilake <himira at linux lk>
 +
@@ -7251,7 +7203,7 @@ diff -uNr libc.old/localedata/locales/si_LK libc/localedata/locales/si_LK
 +LC_NAME
 +% This is the ISO_IEC TR14652 Locale definition for the LC_NAME category
 +%
-+name_fmt    "<U0025><U0070><U0025><U0074><U0025><U0066><U0025><U0074><U0025><U0067>"
++name_fmt    "<U0025><U0067><U0025><U0074><U0025><U006D><U0025><U0074><U0025><U0066><U0025><U0074><U0025><U0073>"
 +name_gen    ""
 +name_mr     "<U0DB8><U0DBA><U0DCF>"
 +name_mrs    "<U0DB8><U0DD2><U0DBA>"

diff --git a/glibc-sr_CS.patch b/glibc-sr_CS.patch
index bbb4363d0cfa2393180db940386155c1da325429..b69345da0e5164ee5953733e21ac03a878ed2c85 100644 (file)
--- a/glibc-sr_CS.patch
+++ b/glibc-sr_CS.patch
@@ -1,357 +1,5 @@
---- glibc-2.3.3/localedata/locales/sr_CS.orig  Thu Jan  1 01:00:00 1970
-+++ glibc-2.3.3/localedata/locales/sr_CS       Mon Jan 19 15:13:42 2004
-@@ -0,0 +1,349 @@
-+comment_char %
-+escape_char  /
-+%
-+% Serbian Language Locale for Serbia and Montenegro
-+% Source: sr_YU locale
-+% Address:
-+%
-+% Contact: Danilo Segan
-+% Email: dsegan@gmx.net
-+% Tel: +381 63 8626082
-+% Fax: none
-+% Language: sr
-+% Territory: CS
-+% Revision: 1.0
-+% Date: 2003-08-13
-+% Application: general
-+% Users: general
-+% Charset: UTF-8, ISO-8859-5
-+% Distribution and use is free, also
-+% for commercial purposes.
-+%
-+% TODO:
-+% -- fix LC_COLLATE to work correctly for latin alphabet too
-+%
-+
-+LC_IDENTIFICATION
-+title      "Serbian locale for Serbia and Montenegro"
-+source     "sr_YU locale"
-+address    ""
-+contact    "Danilo Segan"
-+email      "bug-glibc@gnu.org"
-+tel        ""
-+fax        ""
-+language   "Serbian"
-+territory  "Serbia and Montenegro"
-+revision   "1.1"
-+date       "2004-01-10"
-+audience   "general"
-+application   "GNU locale"
-+abbreviation  ""
-+%
-+category  i18n:1997;LC_IDENTIFICATION
-+category  i18n:1997;LC_CTYPE
-+category  i18n:1997;LC_COLLATE
-+category  i18n:1997;LC_MONETARY
-+category  i18n:1997;LC_NUMERIC
-+category  i18n:1997;LC_TIME
-+category  i18n:1997;LC_MESSAGES
-+category  i18n:1997;LC_PAPER
-+category  i18n:1997;LC_NAME
-+category  i18n:1997;LC_ADDRESS
-+category  i18n:1997;LC_TELEPHONE
-+category  i18n:1997;LC_MEASUREMENT
-+END LC_IDENTIFICATION
-+
-+LC_CTYPE
-+copy "i18n"
-+translit_start
-+include "translit_combining";""
-+
-+% cyrillic -> latin
-+<U0452> "<U0111>";"<U0064><U006A>" % d-
-+<U0453> "<U0067><U006A>" % gj
-+<U0455> "<U0064><U007A>" % dz
-+<U0458> "<U006A>" % j
-+<U0459> "<U006C><U006A>" % lj
-+<U045A> "<U006e><U006A>" % nj
-+<U045B> "<U0107>";"<U0063>" % c'
-+<U045C> "<U006B><U006A>" % kj
-+<U045F> "<U0064><U017E>";"<U0064><U007A>" % dz<
-+
-+<U0402> "<U0110>";"<U0044><U006A>" % D-
-+<U0403> "<U0047><U006A>" % Gj
-+<U0405> "<U0044><U007A>" % Dz
-+<U0408> "<U004A>" % J
-+<U0409> "<U004C><U006A>" % Lj
-+<U040A> "<U004e><U006A>" % Nj
-+<U040B> "<U0106>";"<U0043>" % C'
-+<U040C> "<U004B><U006A>" % Kj
-+<U040F> "<U0044><U017E>";"<U0064><U007A>" % Dz<
-+
-+<U0430> "<U0061>"
-+<U0431> "<U0062>"
-+<U0446> "<U0063>"
-+<U0434> "<U0064>"
-+<U0435> "<U0065>"
-+<U0444> "<U0066>"
-+<U0433> "<U0067>"
-+<U0445> "<U0068>"
-+<U0438> "<U0069>"
-+<U043A> "<U006B>"
-+<U043B> "<U006C>"
-+<U043C> "<U006D>"
-+<U043D> "<U006E>"
-+<U043E> "<U006F>"
-+<U043F> "<U0070>"
-+<U0440> "<U0072>"
-+<U0441> "<U0073>"
-+<U0442> "<U0074>"
-+<U0443> "<U0075>"
-+<U0432> "<U0076>"
-+<U0437> "<U007A>"
-+<U0436> "<U017E>";"<U007A>" % z<
-+<U0448> "<U0161>";"<U0073>" % s<
-+<U0447> "<U010D>";"<U0063>" % c<
-+
-+<U0410> "<U0041>"
-+<U0411> "<U0042>"
-+<U0426> "<U0043>"
-+<U0414> "<U0044>"
-+<U0415> "<U0045>"
-+<U0424> "<U0046>"
-+<U0413> "<U0047>"
-+<U0425> "<U0048>"
-+<U0418> "<U0049>"
-+<U041A> "<U004B>"
-+<U041B> "<U004C>"
-+<U041C> "<U004D>"
-+<U041D> "<U004E>"
-+<U041E> "<U004F>"
-+<U041F> "<U0050>"
-+<U0420> "<U0052>"
-+<U0421> "<U0053>"
-+<U0422> "<U0054>"
-+<U0423> "<U0055>"
-+<U0412> "<U0056>"
-+<U0417> "<U005A>"
-+<U0416> "<U017D>";"<U005A>" % z<
-+<U0428> "<U0160>";"<U0053>" % s<
-+<U0427> "<U010C>";"<U0063>" % c<
-+
-+translit_end
-+END LC_CTYPE
-+
-+
-+LC_COLLATE
-+
-+copy "iso14651_t1"
-+
-+collating-symbol  <d-z-sh>
-+collating-symbol  <l-j-sh>
-+collating-symbol  <n-j-sh>
-+
-+collating-symbol <cacute>
-+collating-symbol <ccaron>
-+collating-symbol <d//>
-+collating-symbol <scaron>
-+collating-symbol <zcaron>
-+
-+collating-symbol <CAP-MIN>
-+collating-symbol <MIN-CAP>
-+
-+reorder-after <MIN>
-+<MIN-CAP>
-+reorder-after <CAP>
-+<CAP-MIN>
-+
-+reorder-after <c>
-+<cacute>
-+<ccaron>
-+<d>
-+<d-z-sh>
-+<d//>
-+reorder-after <l>
-+<l-j-sh>
-+reorder-after <n>
-+<n-j-sh>
-+reorder-after <s>
-+<scaron>
-+reorder-after <z>
-+<zcaron>
-+
-+reorder-after <U0063>
-+<U0107>       <cacute>;<PCT>;<MIN>;IGNORE
-+<U010D>       <ccaron>;<PCT>;<MIN>;IGNORE
-+reorder-after <U0043>
-+<U0106>       <cacute>;<PCT>;<CAP>;IGNORE
-+<U010C>       <ccaron>;<PCT>;<CAP>;IGNORE
-+
-+reorder-after <U0064>
-+<d-z<>        <d-z-sh>;<PCT>;<MIN>;IGNORE
-+<dz<> <d-z-sh>;<PCT>;<MIN>;IGNORE
-+<d-Z<>        <d-z-sh>;<PCT>;<MIN-CAP>;IGNORE
-+<U0111>       <d//>;<PCT>;<MIN>;IGNORE
-+reorder-after <U0044>
-+<D-Z<>        <d-z-sh>;<PCT>;<CAP>;IGNORE
-+<DZ<> <d-z-sh>;<PCT>;<CAP>;IGNORE
-+<D-z<>        <d-z-sh>;<PCT>;<CAP-MIN>;IGNORE
-+<Dz<> <d-z-sh>;<PCT>;<CAP-MIN>;IGNORE
-+<U0110>       <d//>;<PCT>;<CAP>;IGNORE
-+
-+reorder-after <U006C>
-+<l-j> <l-j-sh>;<PCT>;<MIN>;IGNORE
-+<lj>  <l-j-sh>;<PCT>;<MIN>;IGNORE
-+<l-J> <l-j-sh>;<PCT>;<MIN-CAP>;IGNORE
-+reorder-after <U004C>
-+<L-J> <l-j-sh>;<PCT>;<CAP>;IGNORE
-+<LJ>  <l-j-sh>;<PCT>;<CAP>;IGNORE
-+<L-j> <l-j-sh>;<PCT>;<CAP-MIN>;IGNORE
-+<Lj>  <l-j-sh>;<PCT>;<CAP-MIN>;IGNORE
-+
-+reorder-after <U006E>
-+<n-j> <n-j-sh>;<PCT>;<MIN>;IGNORE
-+<nj>  <n-j-sh>;<PCT>;<MIN>;IGNORE
-+<n-J> <n-j-sh>;<PCT>;<MIN-CAP>;IGNORE
-+reorder-after <U004E>
-+<N-J> <n-j-sh>;<PCT>;<CAP>;IGNORE
-+<NJ>  <n-j-sh>;<PCT>;<CAP>;IGNORE
-+<N-j> <n-j-sh>;<PCT>;<CAP-MIN>;IGNORE
-+<Nj>  <n-j-sh>;<PCT>;<CAP-MIN>;IGNORE
-+
-+reorder-after <U0073>
-+<U0161>       <scaron>;<PCT>;<MIN>;IGNORE
-+reorder-after <U0053>
-+<U0160>       <scaron>;<PCT>;<CAP>;IGNORE
-+
-+reorder-after <U007A>
-+<U017E>       <zcaron>;<PCT>;<MIN>;IGNORE
-+reorder-after <U005A>
-+<U017D>       <zcaron>;<PCT>;<CAP>;IGNORE
-+
-+reorder-end
-+
-+END LC_COLLATE
-+
-+LC_MONETARY
-+int_curr_symbol           "<U0059><U0055><U004D><U0020>"
-+currency_symbol           "<U0434><U0438><U043D>"
-+mon_decimal_point         "<U002C>"
-+mon_thousands_sep         "<U002E>"
-+mon_grouping              3;3
-+positive_sign             ""
-+negative_sign             "<U002D>"
-+int_frac_digits           2
-+frac_digits               2
-+p_cs_precedes             0
-+p_sep_by_space            1
-+n_cs_precedes             0
-+n_sep_by_space            1
-+p_sign_posn               1
-+n_sign_posn               1
-+END LC_MONETARY
-+
-+LC_NUMERIC
-+decimal_point             "<U002C>"
-+thousands_sep             ""
-+grouping                  0;0
-+END LC_NUMERIC
-+
-+LC_TIME
-+
-+abday   "<U043D><U0435><U0434>";"<U043F><U043E><U043D>";/
-+        "<U0443><U0442><U043E>";"<U0441><U0440><U0435>";/
-+        "<U0447><U0435><U0442>";"<U043F><U0435><U0442>";/
-+        "<U0441><U0443><U0431>"
-+day     "<U043D><U0435><U0434><U0435><U0459><U0061>";/
-+        "<U043F><U043E><U043D><U0435><U0434><U0435><U0459><U0430><U043A>";/
-+        "<U0443><U0442><U043E><U0440><U0430><U043A>";/
-+        "<U0441><U0440><U0435><U0434><U0430>";/
-+        "<U0447><U0435><U0442><U0432><U0440><U0442><U0430><U043A>";/
-+        "<U043F><U0435><U0442><U0430><U043A>";/
-+        "<U0441><U0443><U0431><U043E><U0442><U0430>"
-+abmon   "<U0458><U0430><U043D>";"<U0444><U0435><U0431>";/
-+        "<U043C><U0430><U0440>";"<U0430><U043F><U0440>";/
-+        "<U043C><U0430><U0458>";"<U0458><U0443><U043D>";/
-+        "<U0458><U0443><U043B>";"<U0430><U0432><U0433>";/
-+        "<U0441><U0435><U043F>";"<U043E><U043A><U0442>";/
-+        "<U043D><U043E><U0432>";"<U0434><U0435><U0446>"
-+mon     "<U0458><U0430><U043D><U0443><U0430><U0440>";/
-+        "<U0444><U0435><U0431><U0440><U0443><U0430><U0440>";/
-+        "<U043C><U0430><U0440><U0442>";/
-+        "<U0430><U043F><U0440><U0438><U043B>";/
-+        "<U043C><U0430><U0458>";/
-+        "<U0458><U0443><U043D>";/
-+        "<U0458><U0443><U043B>";/
-+        "<U0430><U0432><U0433><U0443><U0441><U0442>";/
-+        "<U0441><U0435><U043F><U0442><U0435><U043C><U0431><U0430><U0440>";/
-+        "<U043E><U043A><U0442><U043E><U0431><U0430><U0440>";/
-+        "<U043D><U043E><U0432><U0435><U043C><U0431><U0430><U0440>";/
-+        "<U0434><U0435><U0446><U0435><U043C><U0431><U0430><U0440>"
-+
-+d_t_fmt "<U0025><U0041><U002C><U0020><U0025><U0064><U002E><U0020>/
-+<U0025><U0042><U0020><U0025><U0059><U002E><U0020><U0025><U0054>/
-+<U0020><U0025><U005A>"
-+d_fmt   "<U0025><U0064><U002E><U0025><U006D><U002E><U0025><U0059><U002E>"
-+t_fmt   "<U0025><U0054>"
-+am_pm   "";""
-+t_fmt_ampm "<U0025><U0054>"
-+date_fmt  "<U0025><U0061><U002c><U0020><U0025><U0065><U002E><U0020>/
-+<U0025><U0062><U0020><U0025><U0059><U002E><U0020><U0020><U0025><U0048>/
-+<U003A><U0025><U004D><U003A><U0025><U0053><U0020><U0025><U005A><U000A>"
-+week    7;19971201;4
-+first_weekday 2
-+first_workday 2
-+END LC_TIME
-+
-+LC_MESSAGES
-+yesexpr "<U005B><U0414><U0434><U0044><U0064><U0059><U0079><U005D><U002E><U002A>"
-+noexpr  "<U005B><U041D><U043D><U004E><U006E><U005D><U002E><U002A>"
-+END LC_MESSAGES
-+
-+LC_PAPER
-+height   297
-+width    210
-+END LC_PAPER
-+
-+LC_NAME
-+name_fmt    "<U0025><U0064><U0025><U0074><U0025><U0067><U0025><U0074>/
-+<U0025><U006D><U0025><U0074><U0025><U0066>"
-+name_gen    ""
-+name_mr     "<U0433><U002D><U0434><U0438><U043D>"
-+name_mrs    "<U0433><U002D><U0452><U0430>"
-+name_miss   "<U0433><U002D><U0452><U0438><U0446><U0430>"
-+name_ms     "<U0433><U002D><U0452><U0430>"
-+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>"
-+country_ab2   "<U0043><U0053>"
-+country_ab3   "<U0053><U0043><U0047>"
-+% FIXME: country_post is probably incorrect
-+country_post  "<U0053><U0043><U0047>"
-+country_name  "<U0421><U0440><U0431><U0438><U0458><U0430><U0020><U0438>/
-+<U0020><U0426><U0440><U043D><U0430><U0020><U0413><U043E><U0440><U0430>"
-+country_num   891
-+country_car   "<U0053><U0043><U0047>"
-+% FIXME: ISBN code is what? "86" that preceedes all the numbers?
-+country_isbn  "<U0038><U0036>"
-+lang_name     "<U0441><U0440><U043F><U0441><U043A><U0438>"
-+lang_term     "<U0073><U0072><U0070>"
-+lang_lib      "<U0073><U0063><U0063>"
-+lang_ab             "<U0073><U0072>"
-+END LC_ADDRESS
-+
-+LC_TELEPHONE
-+tel_int_fmt    "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025>/
-+<U006C>"
-+tel_dom_fmt    "<U0025><U0041><U0020><U0025><U006C>"
-+int_prefix     "<U0033><U0038><U0031>"
-+int_select     "<U0039><U0039>"
-+END LC_TELEPHONE
-+
-+LC_MEASUREMENT
-+measurement    1
-+END LC_MEASUREMENT
---- glibc-2.3.3/localedata/locales/sr_CS@Latn.orig     Thu Jan  1 01:00:00 1970
-+++ glibc-2.3.3/localedata/locales/sr_CS@Latn  Mon Jan 19 15:13:42 2004
+--- glibc-2.3-20051017/localedata/locales/sr_CS@Latn.orig      1970-01-01 01:00:00.000000000 +0100
++++ glibc-2.3-20051017/localedata/locales/sr_CS@Latn   2005-10-24 10:40:20.000000000 +0200
 @@ -0,0 +1,179 @@
 +comment_char %
 +escape_char  /
@@ -366,8 +14,8 @@
 +% Fax: none
 +% Language: sr
 +% Territory: CS
-+% Revision: 1.0
-+% Date: 2003-08-13
++% Revision: 1.2
++% Date: 2004-08-09
 +% Application: general
 +% Users: general
 +% Charset: UTF-8, ISO-8859-2
@@ -388,24 +36,24 @@
 +fax        ""
 +language   "Serbian"
 +territory  "Serbia and Montenegro"
-+revision   "1.1"
-+date       "2004-01-10"
++revision   "1.2"
++date       "2004-08-09"
 +audience   "general"
 +application   "GNU locale"
 +abbreviation  ""
 +%
-+category  i18n:1997;LC_IDENTIFICATION
-+category  i18n:1997;LC_CTYPE
-+category  i18n:1997;LC_COLLATE
-+category  i18n:1997;LC_MONETARY
-+category  i18n:1997;LC_NUMERIC
-+category  i18n:1997;LC_TIME
-+category  i18n:1997;LC_MESSAGES
-+category  i18n:1997;LC_PAPER
-+category  i18n:1997;LC_NAME
-+category  i18n:1997;LC_ADDRESS
-+category  i18n:1997;LC_TELEPHONE
-+category  i18n:1997;LC_MEASUREMENT
++category  "i18n:1997";LC_IDENTIFICATION
++category  "i18n:1997";LC_CTYPE
++category  "i18n:1997";LC_COLLATE
++category  "i18n:1997";LC_MONETARY
++category  "i18n:1997";LC_NUMERIC
++category  "i18n:1997";LC_TIME
++category  "i18n:1997";LC_MESSAGES
++category  "i18n:1997";LC_PAPER
++category  "i18n:1997";LC_NAME
++category  "i18n:1997";LC_ADDRESS
++category  "i18n:1997";LC_TELEPHONE
++category  "i18n:1997";LC_MEASUREMENT
 +END LC_IDENTIFICATION
 +
 +LC_CTYPE
@@ -417,7 +65,7 @@
 +END LC_COLLATE
 +
 +LC_MONETARY
-+int_curr_symbol           "<U0059><U0055><U004D><U0020>"
++int_curr_symbol           "<U0043><U0053><U0044><U0020>"
 +currency_symbol           "<U0064><U0069><U006E>"
 +mon_decimal_point         "<U002C>"
 +mon_thousands_sep         "<U002E>"
@@ -485,8 +133,8 @@
 +END LC_TIME
 +
 +LC_MESSAGES
-+yesexpr "<U005B><U0064><U0044><U0079><U0059><U0031><U005D><U002E><U002A>"
-+noexpr  "<U005B><U006E><U004E><U0030><U005D><U002E><U002A>"
++yesexpr "<U005E><U005B><U0064><U0044><U0079><U0059><U005D>"
++noexpr  "<U005E><U005B><U006E><U004E><U005D>"
 +END LC_MESSAGES
 +
 +LC_PAPER
@@ -532,15 +180,14 @@
 +LC_MEASUREMENT
 +copy "sr_CS"
 +END LC_MEASUREMENT
---- libc/localedata/SUPPORTED.orig     2004-05-17 20:51:41.000000000 +0200
-+++ libc/localedata/SUPPORTED  2004-05-22 12:20:58.950224432 +0200
-@@ -274,6 +274,10 @@
- so_SO/ISO-8859-1 \
+--- glibc-2.3-20051017/localedata/SUPPORTED.orig       2005-07-18 03:50:35.000000000 +0200
++++ glibc-2.3-20051017/localedata/SUPPORTED    2005-10-24 10:31:43.000000000 +0200
+@@ -289,7 +289,9 @@
  sq_AL.UTF-8/UTF-8 \
  sq_AL/ISO-8859-1 \
-+sr_CS.UTF-8/UTF-8 \
+ sr_CS.UTF-8/UTF-8 \
 +sr_CS.UTF-8@Latn/UTF-8 \
-+sr_CS/ISO-8859-5 \
+ sr_CS/ISO-8859-5 \
 +sr_CS@Latn/ISO-8859-2 \
  st_ZA.UTF-8/UTF-8 \
  st_ZA/ISO-8859-1 \