Author: qboosh                       Date: Sat Apr 11 00:22:36 2009 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated for 1.2.1

---- Files affected:
SOURCES:
   xorg-lib-libX11-glibc-locale_sync.patch (1.5 -> 1.6) 

---- Diffs:

================================================================
Index: SOURCES/xorg-lib-libX11-glibc-locale_sync.patch
diff -u SOURCES/xorg-lib-libX11-glibc-locale_sync.patch:1.5 
SOURCES/xorg-lib-libX11-glibc-locale_sync.patch:1.6
--- SOURCES/xorg-lib-libX11-glibc-locale_sync.patch:1.5 Tue Feb 17 17:40:35 2009
+++ SOURCES/xorg-lib-libX11-glibc-locale_sync.patch     Sat Apr 11 02:22:30 2009
@@ -644,8 +644,8 @@
        koi8-u                  \
        ko_KR.UTF-8             \
        microsoft-cp1251        \
---- libX11-1.1.4/nls/compose.dir.pre.orig      2008-03-06 21:45:06.000000000 
+0100
-+++ libX11-1.1.4/nls/compose.dir.pre   2008-03-07 23:21:34.487595975 +0100
+--- libX11-1.2.1/nls/compose.dir.pre.orig      2009-03-17 01:38:41.000000000 
+0100
++++ libX11-1.2.1/nls/compose.dir.pre   2009-04-11 00:26:34.817717159 +0200
 @@ -7,8 +7,11 @@
  XCOMM $XFree86: xc/nls/compose.dir,v 1.24 2003/08/06 14:04:00 eich Exp $
  XCOMM
@@ -767,7 +767,7 @@
  ibm-cp1133/Compose:           lo_LA.IBM-CP1133
  mulelao-1/Compose:            lo_LA.MULELAO-1
  iso8859-1/Compose:            lt_LN.ISO8859-1
-@@ -158,54 +181,57 @@
+@@ -158,52 +181,57 @@
  iso8859-13/Compose:           lt_LT.ISO8859-13
  iso8859-4/Compose:            lv_LV.ISO8859-4
  iso8859-13/Compose:           lv_LV.ISO8859-13
@@ -779,18 +779,16 @@
 +XCOMM microsoft-cp1251/Compose:       mk_MK.CP1251
  iso8859-1/Compose:            ms_MY.ISO8859-1
  iso8859-3/Compose:            mt_MT.ISO8859-3
-+iso8859-1/Compose:            nb_NO.ISO8859-1
-+iso8859-15/Compose:           nb_NO.ISO8859-15
-+iso8859-1/Compose:            nds_DE.ISO8859-1
-+iso8859-15/Compose:           nds_DE.ISO8859-15
  iso8859-1/Compose:            nl_BE.ISO8859-1
  iso8859-15/Compose:           nl_BE.ISO8859-15
  iso8859-1/Compose:            nl_NL.ISO8859-1
  iso8859-15/Compose:           nl_NL.ISO8859-15
 -iso8859-1/Compose:            no_NO.ISO8859-1
 -iso8859-15/Compose:           no_NO.ISO8859-15
--iso8859-1/Compose:            nb_NO.ISO8859-1
--iso8859-15/Compose:           nb_NO.ISO8859-15
+ iso8859-1/Compose:            nb_NO.ISO8859-1
+ iso8859-15/Compose:           nb_NO.ISO8859-15
++iso8859-1/Compose:            nds_DE.ISO8859-1
++iso8859-15/Compose:           nds_DE.ISO8859-15
  iso8859-1/Compose:            nn_NO.ISO8859-1
  iso8859-15/Compose:           nn_NO.ISO8859-15
  iso8859-1/Compose:            nr_ZA.ISO8859-1
@@ -826,7 +824,6 @@
  iso8859-2/Compose:            sk_SK.ISO8859-2
  iso8859-2/Compose:            sl_CS.ISO8859-2
  iso8859-2/Compose:            sl_SI.ISO8859-2
--iso8859-5/Compose:            sp_YU.ISO8859-5
 +iso8859-16/Compose:           sl_SI.ISO8859-16
 +iso8859-1/Compose:            so_DJ.ISO8859-1
 +iso8859-1/Compose:            so_KE.ISO8859-1
@@ -834,7 +831,6 @@
  iso8859-2/Compose:            sq_AL.ISO8859-2
  iso8859-2/Compose:            sr_CS.ISO8859-2
  iso8859-5/Compose:            sr_CS.ISO8859-5
--iso8859-2/Compose:            sr_SP.ISO8859-2
 -iso8859-2/Compose:            sr_YU.ISO8859-2
 -iso8859-5/Compose:            sr_YU.ISO8859-5
 +XCOMM microsoft-cp1251/Compose:       sr_CS.CP1251
@@ -842,7 +838,7 @@
  iso8859-1/Compose:            ss_ZA.ISO8859-1
  iso8859-1/Compose:            st_ZA.ISO8859-1
  iso8859-1/Compose:            sv_FI.ISO8859-1
-@@ -213,39 +239,52 @@
+@@ -211,39 +239,52 @@
  iso8859-1/Compose:            sv_SE.ISO8859-1
  iso8859-15/Compose:           sv_SE.ISO8859-15
  tscii-0/Compose:              ta_IN.TSCII-0
@@ -904,7 +900,7 @@
  en_US.UTF-8/Compose:          ar_IQ.UTF-8
  en_US.UTF-8/Compose:          ar_JO.UTF-8
  en_US.UTF-8/Compose:          ar_KW.UTF-8
-@@ -255,22 +294,25 @@
+@@ -253,22 +294,25 @@
  en_US.UTF-8/Compose:          ar_OM.UTF-8
  en_US.UTF-8/Compose:          ar_QA.UTF-8
  en_US.UTF-8/Compose:          ar_SA.UTF-8
@@ -933,11 +929,8 @@
  en_US.UTF-8/Compose:          da_DK.UTF-8
  en_US.UTF-8/Compose:          de_AT.UTF-8
  en_US.UTF-8/Compose:          de_BE.UTF-8
-@@ -278,18 +320,26 @@
- en_US.UTF-8/Compose:          de_DE.UTF-8
- en_US.UTF-8/Compose:          de_LI.UTF-8
- en_US.UTF-8/Compose:          de_LU.UTF-8
-+el_GR.UTF-8/Compose:          el_CY.UTF-8
+@@ -279,17 +323,24 @@
+ el_GR.UTF-8/Compose:          el_CY.UTF-8
  el_GR.UTF-8/Compose:          el_GR.UTF-8
  en_US.UTF-8/Compose:          en_AU.UTF-8
 +en_US.UTF-8/Compose:          en_BE.UTF-8
@@ -950,6 +943,7 @@
  en_US.UTF-8/Compose:          en_IE.UTF-8
 +en_US.UTF-8/Compose:          en_IN.UTF-8
  en_US.UTF-8/Compose:          en_JM.UTF-8
+ en_US.UTF-8/Compose:          en_MT.UTF-8
  en_US.UTF-8/Compose:          en_NZ.UTF-8
 +en_US.UTF-8/Compose:          en_PH.UTF-8
 +en_US.UTF-8/Compose:          en_SG.UTF-8
@@ -961,7 +955,7 @@
  en_US.UTF-8/Compose:          eo_XX.UTF-8
  en_US.UTF-8/Compose:          es_AR.UTF-8
  en_US.UTF-8/Compose:          es_BO.UTF-8
-@@ -322,12 +374,14 @@
+@@ -323,12 +374,14 @@
  en_US.UTF-8/Compose:          fr_LU.UTF-8
  en_US.UTF-8/Compose:          ga_IE.UTF-8
  en_US.UTF-8/Compose:          gd_GB.UTF-8
@@ -976,12 +970,10 @@
  en_US.UTF-8/Compose:          hu_HU.UTF-8
  en_US.UTF-8/Compose:          hy_AM.UTF-8
  en_US.UTF-8/Compose:          id_ID.UTF-8
-@@ -337,51 +391,75 @@
- en_US.UTF-8/Compose:          iu_CA.UTF-8
- en_US.UTF-8/Compose:          ja_JP.UTF-8
+@@ -340,55 +393,76 @@
  en_US.UTF-8/Compose:          ka_GE.UTF-8
-+en_US.UTF-8/Compose:          kk_KZ.UTF-8
  en_US.UTF-8/Compose:          kl_GL.UTF-8
+ en_US.UTF-8/Compose:          kk_KZ.UTF-8
 +en_US.UTF-8/Compose:          kn_IN.UTF-8
  en_US.UTF-8/Compose:          ko_KR.UTF-8
  en_US.UTF-8/Compose:          kw_GB.UTF-8
@@ -998,24 +990,23 @@
 +en_US.UTF-8/Compose:          mn_MN.UTF-8
 +en_US.UTF-8/Compose:          mr_IN.UTF-8
  en_US.UTF-8/Compose:          ms_MY.UTF-8
-+en_US.UTF-8/Compose:          mt_MT.UTF-8
-+en_US.UTF-8/Compose:          nb_NO.UTF-8
+ en_US.UTF-8/Compose:          mt_MT.UTF-8
 +en_US.UTF-8/Compose:          nds_DE.UTF-8
 +en_US.UTF-8/Compose:          ne_NP.UTF-8
  en_US.UTF-8/Compose:          nl_BE.UTF-8
  en_US.UTF-8/Compose:          nl_NL.UTF-8
+ en_US.UTF-8/Compose:          nn_NO.UTF-8
 -en_US.UTF-8/Compose:          no_NO.UTF-8
--en_US.UTF-8/Compose:          nb_NO.UTF-8
-+en_US.UTF-8/Compose:          nn_NO.UTF-8
+ en_US.UTF-8/Compose:          nb_NO.UTF-8
  en_US.UTF-8/Compose:          nr_ZA.UTF-8
  en_US.UTF-8/Compose:          nso_ZA.UTF-8
--en_US.UTF-8/Compose:          ny_NO.UTF-8
+ en_US.UTF-8/Compose:          ny_NO.UTF-8
  en_US.UTF-8/Compose:          oc_FR.UTF-8
 +en_US.UTF-8/Compose:          om_ET.UTF-8
 +en_US.UTF-8/Compose:          om_KE.UTF-8
 +en_US.UTF-8/Compose:          or_IN.UTF-8
  en_US.UTF-8/Compose:          pa_IN.UTF-8
-+en_US.UTF-8/Compose:          pap_AN.UTF-8
+++ en_US.UTF-8/Compose:                pap_AN.UTF-8
  en_US.UTF-8/Compose:          pd_DE.UTF-8
  en_US.UTF-8/Compose:          pd_US.UTF-8
 -en_US.UTF-8/Compose:          ph_PH.UTF-8
@@ -1028,8 +1019,9 @@
  en_US.UTF-8/Compose:          ru_UA.UTF-8
  en_US.UTF-8/Compose:          rw_RW.UTF-8
 +en_US.UTF-8/Compose:          se_NO.UTF-8
+ en_US.UTF-8/Compose:          sh_BA.UTF-8
  en_US.UTF-8/Compose:          si_LK.UTF-8
-+en_US.UTF-8/Compose:          sid_ET.UTF-8
+++ en_US.UTF-8/Compose:                sid_ET.UTF-8
  en_US.UTF-8/Compose:          sk_SK.UTF-8
  en_US.UTF-8/Compose:          sl_SI.UTF-8
 +en_US.UTF-8/Compose:          so_DJ.UTF-8
@@ -1038,8 +1030,9 @@
 +en_US.UTF-8/Compose:          so_SO.UTF-8
  en_US.UTF-8/Compose:          sq_AL.UTF-8
  en_US.UTF-8/Compose:          sr_CS.UTF-8
+ en_US.UTF-8/Compose:          sr_ME.UTF-8
+ en_US.UTF-8/Compose:          sr_RS.UTF-8
 -en_US.UTF-8/Compose:          sr_YU.UTF-8
-+en_US.UTF-8/Compose:          sr_ME.UTF-8
  en_US.UTF-8/Compose:          ss_ZA.UTF-8
  en_US.UTF-8/Compose:          st_ZA.UTF-8
  en_US.UTF-8/Compose:          sv_FI.UTF-8
@@ -1058,7 +1051,7 @@
  en_US.UTF-8/Compose:          tr_TR.UTF-8
  en_US.UTF-8/Compose:          ts_ZA.UTF-8
  en_US.UTF-8/Compose:          tt_RU.UTF-8
-@@ -391,8 +469,7 @@
+@@ -398,8 +472,7 @@
  en_US.UTF-8/Compose:          ve_ZA.UTF-8
  en_US.UTF-8/Compose:          vi_VN.UTF-8
  en_US.UTF-8/Compose:          wa_BE.UTF-8
@@ -1068,8 +1061,8 @@
  en_US.UTF-8/Compose:          zh_TW.UTF-8
  en_US.UTF-8/Compose:          zu_ZA.UTF-8
 -en_US.UTF-8/Compose:          bs_BA.UTF-8
---- libX11-1.1.5/nls/locale.alias.pre.orig     2008-05-07 19:03:34.000000000 
+0200
-+++ libX11-1.1.5/nls/locale.alias.pre  2008-09-09 08:28:09.120985632 +0200
+--- libX11-1.2.1/nls/locale.alias.pre.orig     2009-03-17 01:40:04.000000000 
+0100
++++ libX11-1.2.1/nls/locale.alias.pre  2009-04-11 00:58:20.965723864 +0200
 @@ -17,17 +17,34 @@
  Cextend:                                      en_US.ISO8859-1
  Cextend.en:                                   en_US.ISO8859-1
@@ -1215,9 +1208,9 @@
 +az...@cyrillic:                                       az_AZ.KOI8-K
 +az_az.ko...@cyrillic:                         az_AZ.KOI8-K
  be:                                           be_BY.CP1251
+ b...@latin:                                   be_by.ut...@latin
  be_BY:                                                be_BY.CP1251
- be_BY.cp1251:                                 be_BY.CP1251
-@@ -123,28 +163,36 @@
+@@ -126,28 +166,36 @@
  bg_BG.microsoftcp1251:                                bg_BG.CP1251
  bg_BG.microsoft-cp1251:                               bg_BG.CP1251
  bg_BG.MICROSOFT-CP1251:                               bg_BG.CP1251
@@ -1257,7 +1250,7 @@
  ca:                                           ca_ES.ISO8859-1
  ca_AD:                                                ca_AD.ISO8859-1
  ca...@euro:                                   ca_AD.ISO8859-15
-@@ -159,11 +207,15 @@
+@@ -162,11 +210,15 @@
  ca...@euro:                                   ca_ES.ISO8859-15
  ca_ES.iso88591:                                       ca_ES.ISO8859-1
  ca_ES.ISO-8859-1:                             ca_ES.ISO8859-1
@@ -1274,7 +1267,7 @@
  ca_FR:                                                ca_FR.ISO8859-1
  ca...@euro:                                   ca_FR.ISO8859-15
  ca_FR.iso88591:                                       ca_FR.ISO8859-1
-@@ -191,19 +243,26 @@
+@@ -194,19 +246,26 @@
  cs_CZ.ISO-8859-2:                             cs_CZ.ISO8859-2
  cs_CZ.ISO_8859-2:                             cs_CZ.ISO8859-2
  cs_CZ.utf8:                                   cs_CZ.UTF-8
@@ -1306,9 +1299,9 @@
 +cz_CZ.utf8:                                   cs_CZ.UTF-8
 +cz_CZ.UTF-8:                                  cs_CZ.UTF-8
  da:                                           da_DK.ISO8859-1
+ da.ISO8859-15:                                        da_DK.ISO8859-15
  da_DK:                                                da_DK.ISO8859-1
- DA_DK:                                                da_DK.ISO8859-1
-@@ -225,18 +284,23 @@
+@@ -230,18 +289,23 @@
  de_AT.ISO_8859-1:                             de_AT.ISO8859-1
  de_AT.iso885915:                              de_AT.ISO8859-15
  de_AT.ISO-8859-15:                            de_AT.ISO8859-15
@@ -1333,7 +1326,7 @@
  de_be.ut...@euro:                             de_BE.UTF-8
  de_CH:                                                de_CH.ISO8859-1
  de_CH.iso88591:                                       de_CH.ISO8859-1
-@@ -258,7 +322,9 @@
+@@ -263,7 +327,9 @@
  de_DE.ISO_8859-15:                            de_DE.ISO8859-15
  de_DE.8859-15:                                        de_DE.ISO8859-15
  de_de.8859...@euro:                           de_DE.ISO8859-15
@@ -1343,7 +1336,7 @@
  de_de.ut...@euro:                             de_DE.UTF-8
  de_DE.utf8:                                   de_DE.UTF-8
  de_LU:                                                de_LU.ISO8859-1
-@@ -266,22 +332,31 @@
+@@ -271,22 +337,31 @@
  de_LU.iso88591:                                       de_LU.ISO8859-1
  de_LU.ISO_8859-1:                             de_LU.ISO8859-1
  de_LU.ISO-8859-1:                             de_LU.ISO8859-1
@@ -1380,7 +1373,7 @@
  el_GR.utf8:                                   el_GR.UTF-8
  en:                                           en_US.ISO8859-1
  en.ISO-8859-1:                                        en_US.ISO8859-1
-@@ -296,11 +371,18 @@
+@@ -301,11 +376,18 @@
  en_BW:                                                en_BW.ISO8859-1
  en_BW.iso88591:                                       en_BW.ISO8859-1
  en_BW.ISO-8859-1:                             en_BW.ISO8859-1
@@ -1399,7 +1392,7 @@
  en_GB:                                                en_GB.ISO8859-1
  en_GB.88591:                                  en_GB.ISO8859-1
  en_GB.88591.en:                                       en_GB.ISO8859-1
-@@ -311,31 +393,45 @@
+@@ -316,31 +398,45 @@
  en_GB.ISO-8859-15:                            en_GB.ISO8859-15
  en_GB.utf8:                                   en_GB.UTF-8
  en_UK:                                                en_GB.ISO8859-1
@@ -1445,7 +1438,7 @@
  en_US:                                                en_US.ISO8859-1
  EN_US:                                                en_US.ISO8859-1
  en_US.88591:                                  en_US.ISO8859-1
-@@ -349,15 +445,6 @@
+@@ -354,15 +450,6 @@
  en_us.iso8859...@euro:                                en_US.ISO8859-15
  en_US.utf8:                                   en_US.UTF-8
  EN_US.UTF-8:                                  en_US.UTF-8
@@ -1461,7 +1454,7 @@
  en_ZA:                                                en_ZA.ISO8859-1
  en_ZA.88591:                                  en_ZA.ISO8859-1
  en_ZA.88591.en:                                       en_ZA.ISO8859-1
-@@ -370,104 +457,128 @@
+@@ -375,36 +462,45 @@
  en_ZW:                                                en_ZW.ISO8859-1
  en_ZW.iso88591:                                       en_ZW.ISO8859-1
  en_ZW.ISO-8859-1:                             en_ZW.ISO8859-1
@@ -1470,42 +1463,39 @@
  eo:                                           eo_XX.ISO8859-3
 -eo_EO:                                                eo_EO.ISO8859-3
 -eo_EO.ISO8859-3:                              eo_EO.ISO8859-3
+-eo_XX:                                                eo_XX.ISO8859-3
+-eo_XX.ISO8859-3:                              eo_XX.ISO8859-3
 +eo_EO:                                                eo_XX.ISO8859-3
 +eo_EO.ISO8859-3:                              eo_XX.ISO8859-3
- eo_XX:                                                eo_XX.ISO8859-3
--eo_XX.ISO8859-3:                              eo_XX.ISO8859-3
 +eo_XX.iso88593:                                       eo_XX.ISO8859-3
 +eo_XX.ISO-8859-3:                             eo_XX.ISO8859-3
 +eo_XX.ISO_8859-3:                             eo_XX.ISO8859-3
  es:                                           es_ES.ISO8859-1
+ es.UTF-8:                                     es_ES.UTF-8
  es_AR:                                                es_AR.ISO8859-1
  es_AR.iso88591:                                       es_AR.ISO8859-1
  es_AR.ISO-8859-1:                             es_AR.ISO8859-1
 +es_AR.ISO_8859-1:                             es_AR.ISO8859-1
  es_AR.utf8:                                   es_AR.UTF-8
  es_BO:                                                es_BO.ISO8859-1
--es_BO.iso88591:                                       es_BO.ISO8859-1
+ es_BO.iso88591:                                       es_BO.ISO8859-1
  es_BO.ISO-8859-1:                             es_BO.ISO8859-1
 +es_BO.ISO_8859-1:                             es_BO.ISO8859-1
-+es_BO.iso88591:                                       es_BO.ISO8859-1
  es_BO.utf8:                                   es_BO.UTF-8
-+es_CL.ISO-8859-1:                             es_CL.ISO8859-1
-+es_CL.ISO_8859-1:                             es_CL.ISO8859-1
  es_CL:                                                es_CL.ISO8859-1
  es_CL.iso88591:                                       es_CL.ISO8859-1
--es_CL.ISO-8859-1:                             es_CL.ISO8859-1
+ es_CL.ISO-8859-1:                             es_CL.ISO8859-1
++es_CL.ISO_8859-1:                             es_CL.ISO8859-1
  es_CL.utf8:                                   es_CL.UTF-8
  es_CO:                                                es_CO.ISO8859-1
--es_CO.iso88591:                                       es_CO.ISO8859-1
+ es_CO.iso88591:                                       es_CO.ISO8859-1
  es_CO.ISO-8859-1:                             es_CO.ISO8859-1
 +es_CO.ISO_8859-1:                             es_CO.ISO8859-1
-+es_CO.iso88591:                                       es_CO.ISO8859-1
  es_CO.utf8:                                   es_CO.UTF-8
  es_CR:                                                es_CR.ISO8859-1
--es_CR.iso88591:                                       es_CR.ISO8859-1
+ es_CR.iso88591:                                       es_CR.ISO8859-1
  es_CR.ISO-8859-1:                             es_CR.ISO8859-1
 +es_CR.ISO_8859-1:                             es_CR.ISO8859-1
-+es_CR.iso88591:                                       es_CR.ISO8859-1
  es_CR.utf8:                                   es_CR.UTF-8
  es_DO:                                                es_DO.ISO8859-1
  es_DO.iso88591:                                       es_DO.ISO8859-1
@@ -1514,41 +1504,32 @@
  es_DO.utf8:                                   es_DO.UTF-8
  es_EC:                                                es_EC.ISO8859-1
  es_EC.iso88591:                                       es_EC.ISO8859-1
- es_EC.ISO-8859-1:                             es_EC.ISO8859-1
-+es_EC.ISO_8859-1:                             es_EC.ISO8859-1
- es_EC.utf8:                                   es_EC.UTF-8
--es_ES:                                                es_ES.ISO8859-1
--es_ES.88591:                                  es_ES.ISO8859-1
--es_ES.88591.en:                                       es_ES.ISO8859-1
- es_ES.iso88591:                                       es_ES.ISO8859-1
+@@ -417,63 +513,79 @@
  es_ES.ISO-8859-1:                             es_ES.ISO8859-1
  es_ES.ISO_8859-1:                             es_ES.ISO8859-1
  es_ES.iso885915:                              es_ES.ISO8859-15
 +es_es.iso885...@euro:                         es_ES.ISO8859-15
  es_ES.ISO-8859-15:                            es_ES.ISO8859-15
++es_ES.ISO_8859-15:                            es_ES.ISO8859-15
  es_es.iso-8859...@euro:                               es_ES.ISO8859-15
 +es_es.iso_8859...@euro:                               es_ES.ISO8859-15
  es...@euro:                                   es_ES.ISO8859-15
  es_es.ut...@euro:                             es_ES.UTF-8
  es_ES.utf8:                                   es_ES.UTF-8
--es_GT:                                                es_GT.ISO8859-1
-+es_ES:                                                es_ES.ISO8859-1
+ es_GT:                                                es_GT.ISO8859-1
  es_GT.iso88591:                                       es_GT.ISO8859-1
  es_GT.ISO-8859-1:                             es_GT.ISO8859-1
 +es_GT.ISO_8859-1:                             es_GT.ISO8859-1
-+es_GT:                                                es_GT.ISO8859-1
  es_GT.utf8:                                   es_GT.UTF-8
-+es_HN.ISO-8859-1:                             es_HN.ISO8859-1
-+es_HN.ISO_8859-1:                             es_HN.ISO8859-1
  es_HN:                                                es_HN.ISO8859-1
  es_HN.iso88591:                                       es_HN.ISO8859-1
--es_HN.ISO-8859-1:                             es_HN.ISO8859-1
+ es_HN.ISO-8859-1:                             es_HN.ISO8859-1
++es_HN.ISO_8859-1:                             es_HN.ISO8859-1
  es_HN.utf8:                                   es_HN.UTF-8
-+es_MX.ISO-8859-1:                             es_MX.ISO8859-1
-+es_MX.ISO_8859-1:                             es_MX.ISO8859-1
  es_MX:                                                es_MX.ISO8859-1
  es_MX.iso88591:                                       es_MX.ISO8859-1
--es_MX.ISO-8859-1:                             es_MX.ISO8859-1
+ es_MX.ISO-8859-1:                             es_MX.ISO8859-1
++es_MX.ISO_8859-1:                             es_MX.ISO8859-1
  es_MX.utf8:                                   es_MX.UTF-8
  es_NI:                                                es_NI.ISO8859-1
  es_NI.iso88591:                                       es_NI.ISO8859-1
@@ -1607,7 +1588,7 @@
  es_VE.utf8:                                   es_VE.UTF-8
  #if defined(SVR4) && defined(sun)
  XCOMM Sun Solaris 2.6 has erroneously specified Estonian as a Latin-1
-@@ -475,47 +586,64 @@
+@@ -481,50 +593,70 @@
  #endif
  XCOMM According to Estonian local standards, ISO8859-4 is not a recommended
  XCOMM charset. EVS8:2000 specifies ISO8859-15 as the base charset.
@@ -1621,12 +1602,13 @@
 +et_EE.ISO_8859-1:                             et_EE.ISO8859-1
  et_EE.iso88594:                                       et_EE.ISO8859-4
  et_EE.ISO-8859-4:                             et_EE.ISO8859-4
++et_EE.ISO_8859-4:                             et_EE.ISO8859-4
  et_EE.iso885913:                              et_EE.ISO8859-13
-+et_EE.ISO-8859-15:                            et_EE.ISO8859-15
-+et_EE.ISO_8859-15:                            et_EE.ISO8859-15
  et_EE.ISO-8859-13:                            et_EE.ISO8859-13
++et_EE.ISO_8859-13:                            et_EE.ISO8859-13
  et_EE.iso885915:                              et_EE.ISO8859-15
--et_EE.ISO-8859-15:                            et_EE.ISO8859-15
+ et_EE.ISO-8859-15:                            et_EE.ISO8859-15
++et_EE.ISO_8859-15:                            et_EE.ISO8859-15
  et_EE.utf8:                                   et_EE.UTF-8
  eu:                                           eu_ES.ISO8859-1
  eu_ES:                                                eu_ES.ISO8859-1
@@ -1636,7 +1618,6 @@
  eu_ES.iso885915:                              eu_ES.ISO8859-15
  eu_ES.ISO-8859-15:                            eu_ES.ISO8859-15
 +eu_ES.ISO_8859-15:                            eu_ES.ISO8859-15
-+eu_es.iso885...@euro:                         eu_ES.ISO8859-15
  eu_es.iso-8859...@euro:                               eu_ES.ISO8859-15
 +eu_es.iso_8859...@euro:                               eu_ES.ISO8859-15
  eu...@euro:                                   eu_ES.ISO8859-15
@@ -1647,8 +1628,9 @@
  fa_IR.isiri3342:                              fa_IR.ISIRI-3342
  fa_IR.utf8:                                   fa_IR.UTF-8
 -fi:                                           fi_FI.ISO8859-15
--fi_FI:                                                fi_FI.ISO8859-15
 +fi:                                           fi_FI.ISO8859-1
+ fi.ISO8859-15:                                        fi_FI.ISO8859-15
+-fi_FI:                                                fi_FI.ISO8859-15
 +fi_FI:                                                fi_FI.ISO8859-1
  fi_FI.88591:                                  fi_FI.ISO8859-1
  fi_FI.88591.en:                                       fi_FI.ISO8859-1
@@ -1656,11 +1638,11 @@
  fi_FI.ISO-8859-1:                             fi_FI.ISO8859-1
  fi_FI.ISO_8859-1:                             fi_FI.ISO8859-1
  fi_FI.iso885915:                              fi_FI.ISO8859-15
--fi_FI.ISO-8859-15:                            fi_FI.ISO8859-15
 +fi_fi.iso885...@euro:                         fi_FI.ISO8859-15
+ fi_FI.ISO-8859-15:                            fi_FI.ISO8859-15
++fi_FI.ISO_8859-15:                            fi_FI.ISO8859-15
  fi_fi.iso-8859...@euro:                               fi_FI.ISO8859-15
 +fi_fi.iso_8859...@euro:                               fi_FI.ISO8859-15
-+fi_FI.ISO-8859-15:                            fi_FI.ISO8859-15
  fi...@euro:                                   fi_FI.ISO8859-15
  fi_FI.utf8:                                   fi_FI.UTF-8
  fi_fi.ut...@euro:                             fi_FI.UTF-8
@@ -1677,8 +1659,11 @@
 +fo_FO.ISO_8859-1:                             fo_FO.ISO8859-1
  fo_FO.iso885915:                              fo_FO.ISO8859-15
  fo_FO.ISO-8859-15:                            fo_FO.ISO8859-15
++fo_FO.ISO_8859-15:                            fo_FO.ISO8859-15
  fo_FO.utf8:                                   fo_FO.UTF-8
-@@ -523,11 +651,15 @@
+ fr:                                           fr_FR.ISO8859-1
+ fr.ISO8859-15:                                        fr_FR.ISO8859-15
+@@ -532,11 +664,15 @@
  fr_BE:                                                fr_BE.ISO8859-1
  fr_BE.88591:                                  fr_BE.ISO8859-1
  fr_BE.88591.en:                                       fr_BE.ISO8859-1
@@ -1694,7 +1679,7 @@
  fr...@euro:                                   fr_BE.ISO8859-15
  fr_BE.utf8:                                   fr_BE.UTF-8
  fr_be.ut...@euro:                             fr_BE.UTF-8
-@@ -543,11 +675,15 @@
+@@ -552,11 +688,15 @@
  fr_CH:                                                fr_CH.ISO8859-1
  fr_CH.88591:                                  fr_CH.ISO8859-1
  fr_CH.88591.en:                                       fr_CH.ISO8859-1
@@ -1710,7 +1695,7 @@
  fr_FR:                                                fr_FR.ISO8859-1
  fr_FR.88591:                                  fr_FR.ISO8859-1
  fr_FR.88591.en:                                       fr_FR.ISO8859-1
-@@ -556,10 +692,12 @@
+@@ -565,10 +705,12 @@
  fr_FR.ISO_8859-1:                             fr_FR.ISO8859-1
  fr_FR.iso885915:                              fr_FR.ISO8859-15
  fr_FR.ISO-8859-15:                            fr_FR.ISO8859-15
@@ -1724,7 +1709,7 @@
  fr_LU:                                                fr_LU.ISO8859-1
  fr_LU.88591:                                  fr_LU.ISO8859-1
  fr_LU.88591.en:                                       fr_LU.ISO8859-1
-@@ -568,7 +706,6 @@
+@@ -577,7 +719,6 @@
  fr_LU.ISO_8859-1:                             fr_LU.ISO8859-1
  fr_LU.iso885915:                              fr_LU.ISO8859-15
  fr_LU.ISO-8859-15:                            fr_LU.ISO8859-15
@@ -1732,7 +1717,7 @@
  fr...@euro:                                   fr_LU.ISO8859-15
  fr_lu.ut...@euro:                             fr_LU.UTF-8
  fr_LU.utf8:                                   fr_LU.UTF-8
-@@ -578,11 +715,16 @@
+@@ -587,11 +728,16 @@
  ga_IE:                                                ga_IE.ISO8859-1
  ga_IE.iso88591:                                       ga_IE.ISO8859-1
  ga_IE.ISO-8859-1:                             ga_IE.ISO8859-1
@@ -1749,7 +1734,7 @@
  ga...@euro:                                   ga_IE.ISO8859-15
  ga_ie.ut...@euro:                             ga_IE.UTF-8
  ga_IE.utf8:                                   ga_IE.UTF-8
-@@ -590,44 +732,62 @@
+@@ -599,44 +745,62 @@
  gd_GB:                                                gd_GB.ISO8859-1
  gd_GB.iso88591:                                       gd_GB.ISO8859-1
  gd_GB.ISO-8859-1:                             gd_GB.ISO8859-1
@@ -1815,7 +1800,7 @@
  hi_IN.isciidev:                                       hi_IN.ISCII-DEV
  hi_IN.utf8:                                   hi_IN.UTF-8
  HI_IN.UTF-8:                                  hi_IN.UTF-8
-@@ -637,10 +797,31 @@
+@@ -646,11 +810,31 @@
  hr_HR.ISO-8859-2:                             hr_HR.ISO8859-2
  hr_HR.ISO_8859-2:                             hr_HR.ISO8859-2
  hr_HR.utf8:                                   hr_HR.UTF-8
@@ -1833,7 +1818,7 @@
 +hu_HU.iso885916:                              hu_HU.ISO8859-16
 +hu_HU.ISO-8859-16:                            hu_HU.ISO8859-16
 +hu_HU.ISO_8859-16:                            hu_HU.ISO8859-16
-+hu_HU.utf8:                                   hu_HU.UTF-8
+ hu_HU.utf8:                                   hu_HU.UTF-8
 +hy:                                           hy_AM.UTF-8
 +hy_AM:                                                hy_AM.UTF-8
 +hy_AM.armscii8:                                       hy_AM.ARMSCII-8
@@ -1847,8 +1832,8 @@
  XCOMM in was the old ISO code for Indonesian (now id).  These lines should be
  XCOMM deleted in the future.
  in:                                           id_ID.ISO8859-1
-@@ -656,8 +837,8 @@
- it:                                           it_IT.ISO8859-1
+@@ -668,8 +852,8 @@
+ it.UTF-8:                                     it_IT.UTF-8
  it_CH:                                                it_CH.ISO8859-1
  it_CH.iso88591:                                       it_CH.ISO8859-1
 -it_CH.ISO_8859-1:                             it_CH.ISO8859-1
@@ -1857,7 +1842,7 @@
  it_CH.iso885915:                              it_CH.ISO8859-15
  it_CH.utf8:                                   it_CH.UTF-8
  it_IT:                                                it_IT.ISO8859-1
-@@ -668,13 +849,16 @@
+@@ -680,13 +864,16 @@
  it_IT.ISO_8859-1:                             it_IT.ISO8859-1
  it_IT.iso885915:                              it_IT.ISO8859-15
  it_IT.ISO-8859-15:                            it_IT.ISO8859-15
@@ -1877,7 +1862,7 @@
  XCOMM iw was the old ISO code for Hebrew (now he).  These lines should be
  XCOMM deleted in the future.
  iw:                                           he_IL.ISO8859-8
-@@ -683,20 +867,20 @@
+@@ -695,20 +882,20 @@
  iw_IL.iso88598:                                       he_IL.ISO8859-8
  iw_IL.ISO-8859-8:                             he_IL.ISO8859-8
  #ifndef __uxp__
@@ -1901,10 +1886,10 @@
  ja_JP.EUC:                                    ja_JP.eucJP
  ja_JP.EUC-JP:                                 ja_JP.eucJP
  ja_JP.EUC_JP:                                 ja_JP.eucJP
-@@ -705,24 +889,28 @@
- ja_JP.JIS:                                    ja_JP.JIS7
+@@ -718,24 +905,27 @@
  ja_JP.jis7:                                   ja_JP.JIS7
  ja_JP.mscode:                                 ja_JP.SJIS
+ ja_JP.PCK:                                    ja_JP.SJIS
 -ja_JP.SJIS:                                   ja_JP.SJIS
  ja_JP.sjis:                                   ja_JP.SJIS
  ja_JP.utf8:                                   ja_JP.UTF-8
@@ -1926,16 +1911,15 @@
  kl_GL.iso88591:                                       kl_GL.ISO8859-1
  kl_GL.ISO-8859-1:                             kl_GL.ISO8859-1
 -kl_GL.iso885915:                              kl_GL.ISO8859-15
-+kl_GL.ISO_8859-1:                             kl_GL.ISO8859-1
  kl_GL.utf8:                                   kl_GL.UTF-8
  kn:                                           kn_IN.UTF-8
 +kn_IN:                                                kn_IN.UTF-8
  kn_IN.utf8:                                   kn_IN.UTF-8
 -kn_IN.UTF-8:                                  kn_IN.UTF-8
  ko:                                           ko_KR.eucKR
+ ko.UTF-8:                                     ko_KR.UTF-8
  ko_KR:                                                ko_KR.eucKR
- KO_KR:                                                ko_KR.eucKR
-@@ -732,23 +920,56 @@
+@@ -746,23 +936,56 @@
  ko_KR.euckr:                                  ko_KR.eucKR
  ko_KR.utf8:                                   ko_KR.UTF-8
  KO_KR.UTF-8:                                  ko_KR.UTF-8
@@ -1994,7 +1978,7 @@
  #if defined(VeryOldFreeBSD)
  XCOMM most locales in FreeBSD 2.1.[56] do not work, allow use of FreeBSD's
  XCOMM generic Latin-1 locale name. N.B. "lt" is a bad code to use for a
-@@ -765,6 +986,8 @@
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/xorg-lib-libX11-glibc-locale_sync.patch?r1=1.5&r2=1.6&f=u

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to