- merged from AC-branch

Changed files:
    glibc-locale_fixes.patch -> 1.11
    glibc-morelocales.patch -> 1.35

diff --git a/glibc-locale_fixes.patch b/glibc-locale_fixes.patch
index 9dafb9650a3b98b1d41309b4492b3864966d329c..1db9066ccf5446f628ef08b77d0415c2177cd13f 100644 (file)
--- a/glibc-locale_fixes.patch
+++ b/glibc-locale_fixes.patch
@@ -4199,6 +4199,67 @@ 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 8fd09fa6fa75c45cb4ede6a933711025730e1ff9..7f57731b7b361adab15c4cb0542e931ea05f396c 100644 (file)
--- a/glibc-morelocales.patch
+++ b/glibc-morelocales.patch
@@ -235,10 +235,11 @@ 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,38 @@
+@@ -287,28 +341,40 @@
  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/KOI8-T \
 +th_TH.ISO-8859-11/ISO-8859-11 \
@@ -253,6 +254,7 @@ diff -uNr libc.old/localedata/SUPPORTED libc/localedata/SUPPORTED
 +tr_CY/ISO-8859-9 \
  tr_TR.UTF-8/UTF-8 \
  tr_TR/ISO-8859-9 \
++tt_RU.KOI8-K/KOI8-K \
  tt_RU.UTF-8/UTF-8 \
 +tt_RU/TATAR-CYR \
  uk_UA.UTF-8/UTF-8 \