- exclude doesn't help as we're not packaging these by wildcard anywhere

[packages/glibc.git] / glibc-locale_fixes.patch

diff --git a/glibc-locale_fixes.patch b/glibc-locale_fixes.patch
index dc2b5a0d59b9f7a137b8c2983338919d5d121e76..fa618391f2f915153b7f66a52258efab158a401c 100644 (file)
--- a/glibc-locale_fixes.patch
+++ b/glibc-locale_fixes.patch
@@ -404,17 +404,6 @@ diff -uNr libc.orig/localedata/locales/az_AZ libc/localedata/locales/az_AZ
 diff -uNr libc.orig/localedata/locales/be_BY libc/localedata/locales/be_BY
 --- libc.orig/localedata/locales/be_BY 2003-12-07 14:00:21.000000000 +0100
 +++ libc/localedata/locales/be_BY      2004-11-10 02:36:38.000000000 +0100
-@@ -65,8 +65,8 @@
- END LC_CTYPE
- 
- LC_MESSAGES
--yesexpr "<U005E><U005B><U0414><U0434><U0059><U0079><U005D><U002E><U002A>"
--noexpr  "<U005E><U005B><U041D><U043D><U004E><U006E><U005D><U002E><U002A>"
-+yesexpr "<U005E><U005B><U0414><U0434><U0059><U0079><U005D>"
-+noexpr  "<U005E><U005B><U041D><U043D><U004E><U006E><U005D>"
- END LC_MESSAGES
- 
- LC_MONETARY
 @@ -108,6 +108,8 @@
          "<U0427><U0446><U0432>";/
          "<U041F><U044F><U0442>";/
@@ -852,10 +841,9 @@ diff -uNr libc.orig/localedata/locales/en_BW libc/localedata/locales/en_BW
 +lang_term   "<U0065><U006E><U0067>"
 +lang_lib    "<U0065><U006E><U0067>"
  END LC_ADDRESS
-diff -uNr libc.orig/localedata/locales/en_CA libc/localedata/locales/en_CA
---- libc.orig/localedata/locales/en_CA 2003-12-07 14:00:21.000000000 +0100
-+++ libc/localedata/locales/en_CA      2004-11-10 02:36:38.000000000 +0100
-@@ -2214,7 +2214,14 @@
+--- glibc-2.8/localedata/locales/en_CA.orig    2008-04-16 20:55:50.000000000 +0200
++++ glibc-2.8/localedata/locales/en_CA 2008-05-07 19:19:15.668432508 +0200
+@@ -167,9 +167,12 @@
  <U0020><U0025><U0068><U0020><U0025><U0065><U0020><U0025><U0072><U0025>/
  <U004E><U0025><U0025><U007A><U0020><U0025><U0054><U0025>/
  <U004E><U0025><U0063><U0025><U004E>"
@@ -865,11 +853,9 @@ diff -uNr libc.orig/localedata/locales/en_CA libc/localedata/locales/en_CA
  country_num 124
 +country_car "<U0043><U0044><U004E>"
 +country_isbn "<U0030>"
-+lang_name   "<U0045><U006E><U0067><U006C><U0069><U0073><U0068>"
-+lang_ab     "<U0065><U006E>"
-+lang_term   "<U0065><U006E><U0067>"
-+lang_lib    "<U0065><U006E><U0067>"
- END LC_ADDRESS
+ lang_name     "<U0045><U006E><U0067><U006C><U0069><U0073><U0068>"
+ lang_ab       "<U0065><U006E>"
+ lang_term     "<U0065><U006E><U0067>"
 diff -uNr libc.orig/localedata/locales/en_DK libc/localedata/locales/en_DK
 --- libc.orig/localedata/locales/en_DK 2003-12-07 14:00:21.000000000 +0100
 +++ libc/localedata/locales/en_DK      2004-11-10 02:36:38.000000000 +0100
@@ -1115,16 +1101,6 @@ diff -uNr libc.orig/localedata/locales/es_AR libc/localedata/locales/es_AR
 diff -uNr libc.orig/localedata/locales/es_BO libc/localedata/locales/es_BO
 --- libc.orig/localedata/locales/es_BO 2003-12-07 14:00:21.000000000 +0100
 +++ libc/localedata/locales/es_BO      2004-11-10 02:36:38.000000000 +0100
-@@ -56,8 +56,7 @@
- END LC_CTYPE
- 
- LC_MESSAGES
--yesexpr "<U005E><U005B><U0073><U0053><U0079><U0059><U005D><U002E><U002A>"
--noexpr  "<U005E><U005B><U006E><U004E><U005D><U002E><U002A>"
-+copy "es_ES"
- END LC_MESSAGES
- 
- LC_MONETARY
 @@ -154,7 +153,14 @@
  <U0020><U0025><U0068><U0020><U0025><U0065><U0020><U0025><U0072><U0025>/
  <U004E><U0025><U0025><U007A><U0020><U0025><U0054><U0025>/
@@ -1143,16 +1119,6 @@ diff -uNr libc.orig/localedata/locales/es_BO libc/localedata/locales/es_BO
 diff -uNr libc.orig/localedata/locales/es_CL libc/localedata/locales/es_CL
 --- libc.orig/localedata/locales/es_CL 2003-12-07 14:00:21.000000000 +0100
 +++ libc/localedata/locales/es_CL      2004-11-10 02:36:38.000000000 +0100
-@@ -56,8 +56,7 @@
- END LC_CTYPE
- 
- LC_MESSAGES
--yesexpr "<U005E><U005B><U0073><U0053><U0079><U0059><U005D><U002E><U002A>"
--noexpr  "<U005E><U005B><U006E><U004E><U005D><U002E><U002A>"
-+copy "es_ES"
- END LC_MESSAGES
- 
- LC_MONETARY
 @@ -154,7 +153,14 @@
  <U0020><U0025><U0068><U0020><U0025><U0065><U0020><U0025><U0072><U0025>/
  <U004E><U0025><U0025><U007A><U0020><U0025><U0054><U0025>/
@@ -1171,16 +1137,6 @@ diff -uNr libc.orig/localedata/locales/es_CL libc/localedata/locales/es_CL
 diff -uNr libc.orig/localedata/locales/es_CO libc/localedata/locales/es_CO
 --- libc.orig/localedata/locales/es_CO 2003-12-07 14:00:21.000000000 +0100
 +++ libc/localedata/locales/es_CO      2004-11-10 02:36:38.000000000 +0100
-@@ -56,8 +56,7 @@
- END LC_CTYPE
- 
- LC_MESSAGES
--yesexpr "<U005E><U005B><U0073><U0053><U0079><U0059><U005D><U002E><U002A>"
--noexpr  "<U005E><U005B><U006E><U004E><U005D><U002E><U002A>"
-+copy "es_ES"
- END LC_MESSAGES
- 
- LC_MONETARY
 @@ -154,7 +153,14 @@
  <U0020><U0025><U0068><U0020><U0025><U0065><U0020><U0025><U0072><U0025>/
  <U004E><U0025><U0025><U007A><U0020><U0025><U0054><U0025>/
@@ -1194,50 +1150,11 @@ diff -uNr libc.orig/localedata/locales/es_CO libc/localedata/locales/es_CO
 +lang_name     "<U0045><U0073><U0070><U0061><U00D1><U006F><U006C>"
 +lang_ab       "<U0065><U0073>"
 +lang_term     "<U0073><U0070><U0061>"
-+lang_lib      "<U0073><U0070><U0061>"
- END LC_ADDRESS
-diff -uNr libc.orig/localedata/locales/es_CR libc/localedata/locales/es_CR
---- libc.orig/localedata/locales/es_CR 2003-12-07 14:00:21.000000000 +0100
-+++ libc/localedata/locales/es_CR      2004-11-10 02:36:38.000000000 +0100
-@@ -47,8 +47,7 @@
- END LC_CTYPE
- 
- LC_MESSAGES
--yesexpr "<U005E><U005B><U0073><U0053><U0079><U0059><U005D><U002E><U002A>"
--noexpr  "<U005E><U005B><U006E><U004E><U005D><U002E><U002A>"
-+copy "es_ES"
- END LC_MESSAGES
- 
- LC_MONETARY
-@@ -145,7 +144,15 @@
- <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  "<U0043><U006F><U0073><U0074><U0061><U0020>/
-+<U0052><U0069><U0063><U0061>"
- country_ab2   "<U0043><U0052>"
- country_ab3   "<U0043><U0052><U0049>"
- country_num   188
-+country_car   "<U0043><U0052>"
-+country_isbn  "9968,9977"
-+lang_name     "<U0045><U0073><U0070><U0061><U00D1><U006F><U006C>"
-+lang_ab       "<U0065><U0073>"
-+lang_term     "<U0073><U0070><U0061>"
 +lang_lib      "<U0073><U0070><U0061>"
  END LC_ADDRESS
 diff -uNr libc.orig/localedata/locales/es_DO libc/localedata/locales/es_DO
 --- libc.orig/localedata/locales/es_DO 2003-12-07 14:00:21.000000000 +0100
 +++ libc/localedata/locales/es_DO      2004-11-10 02:36:38.000000000 +0100
-@@ -56,8 +56,7 @@
- END LC_CTYPE
- 
- LC_MESSAGES
--yesexpr "<U005E><U005B><U0073><U0053><U0079><U0059><U005D><U002E><U002A>"
--noexpr  "<U005E><U005B><U006E><U004E><U005D><U002E><U002A>"
-+copy "es_ES"
- END LC_MESSAGES
- 
- LC_MONETARY
 @@ -134,7 +133,7 @@
  LC_TELEPHONE
  tel_int_fmt    "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025>/
@@ -1266,16 +1183,6 @@ diff -uNr libc.orig/localedata/locales/es_DO libc/localedata/locales/es_DO
 diff -uNr libc.orig/localedata/locales/es_EC libc/localedata/locales/es_EC
 --- libc.orig/localedata/locales/es_EC 2003-12-07 14:00:21.000000000 +0100
 +++ libc/localedata/locales/es_EC      2004-11-10 02:36:38.000000000 +0100
-@@ -56,8 +56,7 @@
- END LC_CTYPE
- 
- LC_MESSAGES
--yesexpr "<U005E><U005B><U0073><U0053><U0079><U0059><U005D><U002E><U002A>"
--noexpr  "<U005E><U005B><U006E><U004E><U005D><U002E><U002A>"
-+copy "es_ES"
- END LC_MESSAGES
- 
- LC_MONETARY
 @@ -154,7 +153,14 @@
  <U0020><U0025><U0068><U0020><U0025><U0065><U0020><U0025><U0072><U0025>/
  <U004E><U0025><U0025><U007A><U0020><U0025><U0054><U0025>/
@@ -1325,16 +1232,6 @@ diff -uNr libc.orig/localedata/locales/es_ES libc/localedata/locales/es_ES
 diff -uNr libc.orig/localedata/locales/es_GT libc/localedata/locales/es_GT
 --- libc.orig/localedata/locales/es_GT 2003-12-07 14:00:21.000000000 +0100
 +++ libc/localedata/locales/es_GT      2004-11-10 02:36:38.000000000 +0100
-@@ -56,8 +56,7 @@
- END LC_CTYPE
- 
- LC_MESSAGES
--yesexpr "<U005E><U005B><U0073><U0053><U0079><U0059><U005D><U002E><U002A>"
--noexpr  "<U005E><U005B><U006E><U004E><U005D><U002E><U002A>"
-+copy "es_ES"
- END LC_MESSAGES
- 
- LC_MONETARY
 @@ -154,7 +153,14 @@
  <U0020><U0025><U0068><U0020><U0025><U0065><U0020><U0025><U0072><U0025>/
  <U004E><U0025><U0025><U007A><U0020><U0025><U0054><U0025>/
@@ -1353,16 +1250,6 @@ diff -uNr libc.orig/localedata/locales/es_GT libc/localedata/locales/es_GT
 diff -uNr libc.orig/localedata/locales/es_HN libc/localedata/locales/es_HN
 --- libc.orig/localedata/locales/es_HN 2003-12-07 14:00:21.000000000 +0100
 +++ libc/localedata/locales/es_HN      2004-11-10 02:36:38.000000000 +0100
-@@ -56,8 +56,7 @@
- END LC_CTYPE
- 
- LC_MESSAGES
--yesexpr "<U005E><U005B><U0073><U0053><U0079><U0059><U005D><U002E><U002A>"
--noexpr  "<U005E><U005B><U006E><U004E><U005D><U002E><U002A>"
-+copy "es_ES"
- END LC_MESSAGES
- 
- LC_MONETARY
 @@ -154,7 +153,13 @@
  <U0020><U0025><U0068><U0020><U0025><U0065><U0020><U0025><U0072><U0025>/
  <U004E><U0025><U0025><U007A><U0020><U0025><U0054><U0025>/
@@ -1380,16 +1267,6 @@ diff -uNr libc.orig/localedata/locales/es_HN libc/localedata/locales/es_HN
 diff -uNr libc.orig/localedata/locales/es_MX libc/localedata/locales/es_MX
 --- libc.orig/localedata/locales/es_MX 2003-12-05 01:25:57.000000000 +0100
 +++ libc/localedata/locales/es_MX      2004-11-10 02:36:38.000000000 +0100
-@@ -56,8 +56,7 @@
- END LC_CTYPE
- 
- LC_MESSAGES
--yesexpr "<U005E><U005B><U0073><U0053><U0079><U0059><U005D><U002E><U002A>"
--noexpr  "<U005E><U005B><U006E><U004E><U005D><U002E><U002A>"
-+copy "es_ES"
- END LC_MESSAGES
- 
- LC_MONETARY
 @@ -153,7 +152,14 @@
  <U0020><U0025><U0068><U0020><U0025><U0065><U0020><U0025><U0072><U0025>/
  <U004E><U0025><U0025><U007A><U0020><U0025><U0054><U0025>/
@@ -1408,16 +1285,6 @@ diff -uNr libc.orig/localedata/locales/es_MX libc/localedata/locales/es_MX
 diff -uNr libc.orig/localedata/locales/es_NI libc/localedata/locales/es_NI
 --- libc.orig/localedata/locales/es_NI 2003-12-05 01:25:57.000000000 +0100
 +++ libc/localedata/locales/es_NI      2004-11-10 02:36:38.000000000 +0100
-@@ -47,8 +47,7 @@
- END LC_CTYPE
- 
- LC_MESSAGES
--yesexpr "<U005E><U005B><U0073><U0053><U0079><U0059><U005D><U002E><U002A>"
--noexpr  "<U005E><U005B><U006E><U004E><U005D><U002E><U002A>"
-+copy "es_ES"
- END LC_MESSAGES
- 
- LC_MONETARY
 @@ -144,7 +143,14 @@
  <U0020><U0025><U0068><U0020><U0025><U0065><U0020><U0025><U0072><U0025>/
  <U004E><U0025><U0025><U007A><U0020><U0025><U0054><U0025>/
@@ -1436,16 +1303,6 @@ diff -uNr libc.orig/localedata/locales/es_NI libc/localedata/locales/es_NI
 diff -uNr libc.orig/localedata/locales/es_PA libc/localedata/locales/es_PA
 --- libc.orig/localedata/locales/es_PA 2003-12-05 01:25:57.000000000 +0100
 +++ libc/localedata/locales/es_PA      2004-11-10 02:36:38.000000000 +0100
-@@ -56,8 +56,7 @@
- END LC_CTYPE
- 
- LC_MESSAGES
--yesexpr "<U005E><U005B><U0073><U0053><U0079><U0059><U005D><U002E><U002A>"
--noexpr  "<U005E><U005B><U006E><U004E><U005D><U002E><U002A>"
-+copy "es_ES"
- END LC_MESSAGES
- 
- LC_MONETARY
 @@ -134,7 +133,7 @@
  LC_TELEPHONE
  tel_int_fmt    "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025>/
@@ -1473,16 +1330,6 @@ diff -uNr libc.orig/localedata/locales/es_PA libc/localedata/locales/es_PA
 diff -uNr libc.orig/localedata/locales/es_PE libc/localedata/locales/es_PE
 --- libc.orig/localedata/locales/es_PE 2003-12-05 01:25:57.000000000 +0100
 +++ libc/localedata/locales/es_PE      2004-11-10 02:36:38.000000000 +0100
-@@ -56,8 +56,7 @@
- END LC_CTYPE
- 
- LC_MESSAGES
--yesexpr "<U005E><U005B><U0073><U0053><U0079><U0059><U005D><U002E><U002A>"
--noexpr  "<U005E><U005B><U006E><U004E><U005D><U002E><U002A>"
-+copy "es_ES"
- END LC_MESSAGES
- 
- LC_MONETARY
 @@ -153,7 +152,14 @@
  <U0020><U0025><U0068><U0020><U0025><U0065><U0020><U0025><U0072><U0025>/
  <U004E><U0025><U0025><U007A><U0020><U0025><U0054><U0025>/
@@ -1501,16 +1348,6 @@ diff -uNr libc.orig/localedata/locales/es_PE libc/localedata/locales/es_PE
 diff -uNr libc.orig/localedata/locales/es_PR libc/localedata/locales/es_PR
 --- libc.orig/localedata/locales/es_PR 2003-12-05 01:25:57.000000000 +0100
 +++ libc/localedata/locales/es_PR      2004-11-10 02:36:38.000000000 +0100
-@@ -47,8 +47,7 @@
- END LC_CTYPE
- 
- LC_MESSAGES
--yesexpr "<U005E><U005B><U0073><U0053><U0079><U0059><U005D><U002E><U002A>"
--noexpr  "<U005E><U005B><U006E><U004E><U005D><U002E><U002A>"
-+copy "es_ES"
- END LC_MESSAGES
- 
- LC_MONETARY
 @@ -141,7 +140,14 @@
  <U0020><U0025><U0068><U0020><U0025><U0065><U0020><U0025><U0072><U0025>/
  <U004E><U0025><U0025><U007A><U0020><U0025><U0054><U0025>/
@@ -1529,16 +1366,6 @@ diff -uNr libc.orig/localedata/locales/es_PR libc/localedata/locales/es_PR
 diff -uNr libc.orig/localedata/locales/es_PY libc/localedata/locales/es_PY
 --- libc.orig/localedata/locales/es_PY 2003-12-05 01:25:57.000000000 +0100
 +++ libc/localedata/locales/es_PY      2004-11-10 02:36:38.000000000 +0100
-@@ -56,8 +56,7 @@
- END LC_CTYPE
- 
- LC_MESSAGES
--yesexpr "<U005E><U005B><U0073><U0053><U0079><U0059><U005D><U002E><U002A>"
--noexpr  "<U005E><U005B><U006E><U004E><U005D><U002E><U002A>"
-+copy "es_ES"
- END LC_MESSAGES
- 
- LC_MONETARY
 @@ -153,7 +152,14 @@
  <U0020><U0025><U0068><U0020><U0025><U0065><U0020><U0025><U0072><U0025>/
  <U004E><U0025><U0025><U007A><U0020><U0025><U0054><U0025>/
@@ -1557,16 +1384,6 @@ diff -uNr libc.orig/localedata/locales/es_PY libc/localedata/locales/es_PY
 diff -uNr libc.orig/localedata/locales/es_SV libc/localedata/locales/es_SV
 --- libc.orig/localedata/locales/es_SV 2003-12-07 14:00:21.000000000 +0100
 +++ libc/localedata/locales/es_SV      2004-11-10 02:36:38.000000000 +0100
-@@ -56,8 +56,7 @@
- END LC_CTYPE
- 
- LC_MESSAGES
--yesexpr "<U005E><U005B><U0073><U0053><U0079><U0059><U005D><U002E><U002A>"
--noexpr  "<U005E><U005B><U006E><U004E><U005D><U002E><U002A>"
-+copy "es_ES"
- END LC_MESSAGES
- 
- LC_MONETARY
 @@ -154,7 +153,15 @@
  <U0020><U0025><U0068><U0020><U0025><U0065><U0020><U0025><U0072><U0025>/
  <U004E><U0025><U0025><U007A><U0020><U0025><U0054><U0025>/
@@ -1608,16 +1425,6 @@ diff -uNr libc.orig/localedata/locales/es_US libc/localedata/locales/es_US
 diff -uNr libc.orig/localedata/locales/es_UY libc/localedata/locales/es_UY
 --- libc.orig/localedata/locales/es_UY 2003-12-05 01:25:57.000000000 +0100
 +++ libc/localedata/locales/es_UY      2004-11-10 02:36:38.000000000 +0100
-@@ -56,8 +56,7 @@
- END LC_CTYPE
- 
- LC_MESSAGES
--yesexpr "<U005E><U005B><U0073><U0053><U0079><U0059><U005D><U002E><U002A>"
--noexpr  "<U005E><U005B><U006E><U004E><U005D><U002E><U002A>"
-+copy "es_ES"
- END LC_MESSAGES
- 
- LC_MONETARY
 @@ -153,7 +152,14 @@
  <U0020><U0025><U0068><U0020><U0025><U0065><U0020><U0025><U0072><U0025>/
  <U004E><U0025><U0025><U007A><U0020><U0025><U0054><U0025>/
@@ -1636,16 +1443,6 @@ diff -uNr libc.orig/localedata/locales/es_UY libc/localedata/locales/es_UY
 diff -uNr libc.orig/localedata/locales/es_VE libc/localedata/locales/es_VE
 --- libc.orig/localedata/locales/es_VE 2003-12-05 01:25:57.000000000 +0100
 +++ libc/localedata/locales/es_VE      2004-11-10 02:36:38.000000000 +0100
-@@ -56,8 +56,7 @@
- END LC_CTYPE
- 
- LC_MESSAGES
--yesexpr "<U005E><U005B><U0073><U0053><U0079><U0059><U005D><U002E><U002A>"
--noexpr  "<U005E><U005B><U006E><U004E><U005D><U002E><U002A>"
-+copy "es_ES"
- END LC_MESSAGES
- 
- LC_MONETARY
 @@ -153,7 +152,14 @@
  <U0020><U0025><U0068><U0020><U0025><U0065><U0020><U0025><U0072><U0025>/
  <U004E><U0025><U0025><U007A><U0020><U0025><U0054><U0025>/
@@ -1690,24 +1487,6 @@ diff -uNr libc.orig/localedata/locales/eu_ES libc/localedata/locales/eu_ES
 +lang_term   "<U0065><U0075><U0073>"
 +lang_lib    "<U0062><U0061><U0071>"
  END LC_ADDRESS
-diff -uNr libc.orig/localedata/locales/fi_FI libc/localedata/locales/fi_FI
---- libc.orig/localedata/locales/fi_FI 2003-12-07 14:00:21.000000000 +0100
-+++ libc/localedata/locales/fi_FI      2004-11-10 02:36:38.000000000 +0100
-@@ -2227,7 +2227,14 @@
- <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 "<U0053><U0075><U006F><U006D><U0069>"
- country_ab2 "<U0046><U0049>"
- country_ab3 "<U0046><U0049><U004E>"
- country_num 246
-+country_car "<U0046><U0049><U004E>"
-+country_isbn "951,952"
-+lang_name   "<U0053><U0075><U006F><U006D><U0069>"
-+lang_ab     "<U0066><U0069>"
-+lang_term   "<U0066><U0069><U006E>"
-+lang_lib    "<U0066><U0069><U006E>"
- END LC_ADDRESS
 diff -uNr libc.orig/localedata/locales/fo_FO libc/localedata/locales/fo_FO
 --- libc.orig/localedata/locales/fo_FO 2003-12-05 01:25:57.000000000 +0100
 +++ libc/localedata/locales/fo_FO      2004-11-10 02:36:38.000000000 +0100
@@ -1755,20 +1534,9 @@ diff -uNr libc.orig/localedata/locales/fr_BE libc/localedata/locales/fr_BE
 +lang_term   "<U0066><U0072><U0061>"
 +lang_lib    "<U0066><U0072><U0065>"
  END LC_ADDRESS
-diff -uNr libc.orig/localedata/locales/fr_CA libc/localedata/locales/fr_CA
---- libc.orig/localedata/locales/fr_CA 2003-12-07 14:00:22.000000000 +0100
-+++ libc/localedata/locales/fr_CA      2004-11-10 02:36:38.000000000 +0100
-@@ -55,8 +55,7 @@
- END LC_COLLATE
- 
- LC_MESSAGES
--yesexpr "<U005E><U005B><U006F><U004F><U0079><U0059><U005D><U002E><U002A>"
--noexpr  "<U005E><U005B><U006E><U004E><U005D><U002E><U002A>"
-+copy "fr_FR"
- END LC_MESSAGES
- 
- LC_MONETARY
-@@ -146,7 +145,14 @@
+--- glibc-2.8/localedata/locales/fr_CA.orig    2008-04-16 20:55:50.000000000 +0200
++++ glibc-2.8/localedata/locales/fr_CA 2008-05-07 19:19:51.730487567 +0200
+@@ -146,9 +145,12 @@
  <U0020><U0025><U0068><U0020><U0025><U0065><U0020><U0025><U0072><U0025>/
  <U004E><U0025><U0025><U007A><U0020><U0025><U0054><U0025>/
  <U004E><U0025><U0063><U0025><U004E>"
@@ -1778,11 +1546,9 @@ diff -uNr libc.orig/localedata/locales/fr_CA libc/localedata/locales/fr_CA
  country_num 124
 +country_car "<U0043><U0044><U004E>"
 +country_isbn "<U0032>"
-+lang_name   "<U0065><U0072><U0061><U006E><U00E7><U0061><U0069><U0073>"
-+lang_ab     "<U0066><U0072>"
-+lang_term   "<U0066><U0072><U0061>"
-+lang_lib    "<U0066><U0072><U0065>"
- END LC_ADDRESS
+ lang_name "<U0046><U0072><U0061><U006E><U00E7><U0061><U0069><U0073>"
+ lang_ab   "<U0066><U0072>"
+ lang_term "<U0066><U0072><U0061>"
 diff -uNr libc.orig/localedata/locales/fr_CH libc/localedata/locales/fr_CH
 --- libc.orig/localedata/locales/fr_CH 2003-12-05 01:25:57.000000000 +0100
 +++ libc/localedata/locales/fr_CH      2004-11-10 02:36:38.000000000 +0100
@@ -3585,25 +3351,17 @@ diff -uNr libc.orig/localedata/locales/wa_BE libc/localedata/locales/wa_BE
  country_isbn "2"
  country_car "B"
  lang_name "<U0057><U0061><U006C><U006F><U006E>"
-diff -uNr libc.orig/localedata/locales/wal_ET libc/localedata/locales/wal_ET
---- libc.orig/localedata/locales/wal_ET        2004-05-03 22:49:23.000000000 +0200
-+++ libc/localedata/locales/wal_ET     2004-11-10 02:36:38.000000000 +0100
-@@ -108,13 +108,11 @@
+--- glibc-2.15/localedata/locales/wal_ET.orig  2011-12-23 20:03:55.000000000 +0100
++++ glibc-2.15/localedata/locales/wal_ET       2012-01-04 18:36:24.002145964 +0100
+@@ -108,7 +108,7 @@
  country_ab3   "<U0045><U0054><U0048>"
  country_num   231   % 210 found in at least one ISO 3166 doc
  % country_car   unknown
 -% country_isbn  unknown, Need ISO 2108
 +country_isbn  "<U0039><U0039><U0039><U0034><U0034>"
  lang_name     "<U12C8><U120B><U12ED><U1273><U1271>"
--lang_ab       "<U0077><U0061><U006C>"
-+lang_ab       ""
  lang_term     "<U0077><U0061><U006C>"
  lang_lib      "<U0077><U0061><U006C>"
--
--
- %
- END LC_ADDRESS
- 
 diff -uNr libc.orig/localedata/locales/xh_ZA libc/localedata/locales/xh_ZA
 --- libc.orig/localedata/locales/xh_ZA 2004-11-10 01:45:57.000000000 +0100
 +++ libc/localedata/locales/xh_ZA      2004-11-10 02:36:38.000000000 +0100
@@ -3840,8 +3598,8 @@ diff -uNr libc.orig/localedata/locales/translit_devanagari_iscii libc/localedata
  END LC_MESSAGES
  
  LC_MONETARY
---- glibc-2.7/localedata/locales/ik_CA.orig    2007-10-22 22:32:15.000000000 +0200
-+++ glibc-2.7/localedata/locales/ik_CA 2007-10-22 22:32:15.000000000 +0200
+--- glibc-2.8/localedata/locales/ik_CA.orig    2008-03-04 18:45:50.000000000 +0100
++++ glibc-2.8/localedata/locales/ik_CA 2008-05-07 19:21:10.266964782 +0200
 @@ -203,8 +203,8 @@
  LC_MESSAGES
  yesstr      "<U0061><U0061>"
@@ -3853,22 +3611,15 @@ diff -uNr libc.orig/localedata/locales/translit_devanagari_iscii libc/localedata
  END LC_MESSAGES
  
  % Default paper: A4
-@@ -224,7 +224,21 @@
- END LC_NAME
- 
- LC_ADDRESS
--% FIXME
--copy "en_CA"
-+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>"
+@@ -230,8 +230,17 @@
+ <U0020><U0025><U0068><U0020><U0025><U0065><U0020><U0025><U0072><U0025>/
+ <U004E><U0025><U0025><U007A><U0020><U0025><U0054><U0025>/
+ <U004E><U0025><U0063><U0025><U004E>"
 +% FIXME Canada in Inupiaq
 +country_name "<U0043><U0061><U006E><U0061><U0064><U0061>"
-+country_ab2  "<U0043><U0041>"
-+country_ab3  "<U0043><U0041><U004E>"
-+country_num  124
+ country_ab2 "<U0043><U0041>"
+ country_ab3 "<U0043><U0041><U004E>"
+ country_num 124
 +country_car  "<U0043><U0044><U004E>"
 +country_isbn "<U0030>"
 +% FIXME: Inupiaq in Inupiaq
@@ -3877,25 +3628,18 @@ diff -uNr libc.orig/localedata/locales/translit_devanagari_iscii libc/localedata
 +lang_term    "<U0069><U0070><U006B>"
 +lang_lib     "<U0069><U0070><U006B>"
  END LC_ADDRESS
--
---- glibc-2.7/localedata/locales/iu_CA.orig    2007-10-22 22:41:48.000000000 +0200
-+++ glibc-2.7/localedata/locales/iu_CA 2007-10-22 22:41:48.000000000 +0200
-@@ -41,12 +41,12 @@
+ 
+--- glibc-2.8/localedata/locales/iu_CA.orig    2008-03-04 18:45:50.000000000 +0100
++++ glibc-2.8/localedata/locales/iu_CA 2008-05-07 19:22:36.283864930 +0200
+@@ -41,7 +41,7 @@
  country_ab2 "<U0043><U0041>"
  country_ab3 "<U0043><U0041><U004E>"
  country_num 124
 -country_car "<U0043><U0041><U004E>" % FIXME
-+country_car "<U0043><U0044><U004E>" % FIXME
++country_car "<U0043><U0044><U004E>"
  % FIXME country_isbn for Canada/inuktitut ?
  lang_name "<U1403><U14C4><U1483><U144E><U1450><U1466>"
- lang_ab "iu"
--% FIXME lang_term 
--% FIXME lang_lib 
-+lang_term "iku"
-+lang_lib "iku"
- END LC_ADDRESS
- 
- %%%%%%%%%%%%%
+ lang_ab "<U0069><U0075>"
 --- glibc-2.7/localedata/locales/li_NL.orig    2007-10-22 22:55:04.000000000 +0200
 +++ glibc-2.7/localedata/locales/li_NL 2007-10-22 22:55:04.000000000 +0200
 @@ -10,8 +10,8 @@
@@ -3963,15 +3707,15 @@ diff -uNr libc.orig/localedata/locales/translit_devanagari_iscii libc/localedata
 -country_ab2 "<U0049><U004E>"
 -country_ab3 "<U0049><U004E><U0044>"
 -country_num 356
-++country_name "<U092D><U093E><U0930><U0924><U092E><U094D>"
-++country_ab2  "<U0049><U004E>"
-++country_ab3  "<U0049><U004E><U0044>"
-++country_num  356
-++country_car  "<U0049><U004E><U0044>"
-++lang_name    "<U0938><U0902><U0938><U094D><U0915><U0943><U0924>"
-++lang_ab      "<U0073><U0061>"
-++lang_term    "<U0073><U0061><U006E>"
-++lang_lib     "<U0073><U0061><U006E>"
++country_name "<U092D><U093E><U0930><U0924><U092E><U094D>"
++country_ab2  "<U0049><U004E>"
++country_ab3  "<U0049><U004E><U0044>"
++country_num  356
++country_car  "<U0049><U004E><U0044>"
++lang_name    "<U0938><U0902><U0938><U094D><U0915><U0943><U0924>"
++lang_ab      "<U0073><U0061>"
++lang_term    "<U0073><U0061><U006E>"
++lang_lib     "<U0073><U0061><U006E>"
  END LC_ADDRESS
  
  
@@ -4009,7 +3753,7 @@ diff -uNr libc.orig/localedata/locales/translit_devanagari_iscii libc/localedata
 +country_ab2 "<U0053><U004E>"
 +country_ab3 "<U0053><U0045><U004E>"
 +country_num 686
-++country_car "<U0053><U004E>"
++country_car "<U0053><U004E>"
 +% FIXME: Wolof in Wolof
 +%lang_name  ""
 +lang_ab     "<U0077><U006F>"
@@ -4017,3 +3761,49 @@ diff -uNr libc.orig/localedata/locales/translit_devanagari_iscii libc/localedata
 +lang_lib    "<U0077><U006F><U006C>"
  END LC_ADDRESS
 -
+--- glibc-2.17/localedata/locales/sr_ME.orig   2012-12-25 04:02:13.000000000 +0100
++++ glibc-2.17/localedata/locales/sr_ME        2013-01-04 15:59:24.058148312 +0100
+@@ -149,7 +149,7 @@
+ country_name  "<U0426><U0440><U043D><U0430><U0020><U0413><U043E><U0440><U0430>"
+ country_num   499
+ country_car   "<U004D><U004E><U0045>"
+-country_isbn  "<U0038><U0036>"
++country_isbn  "<U0039><U0039><U0034><U0030>"
+ lang_name     "<U0441><U0440><U043F><U0441><U043A><U0438>"
+ lang_term     "<U0073><U0072><U0070>"
+ lang_lib      "<U0073><U0063><U0063>"
+@@ -157,7 +157,11 @@
+ END LC_ADDRESS
+ 
+ LC_TELEPHONE
+-copy "sr_RS"
++tel_int_fmt   "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025>/
++<U006C>"
++tel_dom_fmt   "<U0025><U0041><U0020><U0025><U006C>"
++int_prefix    "<U0033><U0038><U0032>"
++int_select    "<U0030><U0030>"
+ END LC_TELEPHONE
+ 
+ LC_MEASUREMENT
+--- glibc-2.17/localedata/locales/bo_CN.orig   2012-12-25 04:02:13.000000000 +0100
++++ glibc-2.17/localedata/locales/bo_CN        2013-01-05 07:58:03.573616094 +0100
+@@ -145,7 +145,7 @@
+ LC_NAME
+ % FIXME
+ 
+-name_fmt  ""
++name_fmt  "<U0025><U0070><U0025><U0074><U0025><U0066><U0025><U0074><U0025><U0067>"
+ % name_gen    "FIXME"
+ % name_miss   "FIXME"
+ % name_mr     "FIXME"
+--- glibc-2.17/localedata/locales/bo_IN.orig   2012-12-25 04:02:13.000000000 +0100
++++ glibc-2.17/localedata/locales/bo_IN        2013-01-05 07:59:33.026947563 +0100
+@@ -70,7 +70,7 @@
+ 
+ LC_NAME
+ % FIXME
+-name_fmt      ""
++name_fmt      "<U0025><U0070><U0025><U0074><U0025><U0066><U0025><U0074><U0025><U0067>"
+ % name_gen    "FIXME"
+ % name_miss   "FIXME"
+ % name_mr     "FIXME"