packages: xorg-lib-libX11/xorg-lib-libX11-glibc-locale_sync.patch - updated...

qboosh qboosh at pld-linux.org
Sun Oct 4 10:56:19 CEST 2009


Author: qboosh                       Date: Sun Oct  4 08:56:19 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated for 1.3; adding ISO_* entries dropped, upstream seems to care just about ISO-* ones

---- Files affected:
packages/xorg-lib-libX11:
   xorg-lib-libX11-glibc-locale_sync.patch (1.6 -> 1.7) 

---- Diffs:

================================================================
Index: packages/xorg-lib-libX11/xorg-lib-libX11-glibc-locale_sync.patch
diff -u packages/xorg-lib-libX11/xorg-lib-libX11-glibc-locale_sync.patch:1.6 packages/xorg-lib-libX11/xorg-lib-libX11-glibc-locale_sync.patch:1.7
--- packages/xorg-lib-libX11/xorg-lib-libX11-glibc-locale_sync.patch:1.6	Sat Apr 11 02:22:30 2009
+++ packages/xorg-lib-libX11/xorg-lib-libX11-glibc-locale_sync.patch	Sun Oct  4 10:56:14 2009
@@ -644,8 +644,8 @@
  	koi8-u			\
  	ko_KR.UTF-8		\
  	microsoft-cp1251	\
---- 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
+--- libX11-1.3/nls/compose.dir.pre.orig	2009-09-03 03:12:27.000000000 +0200
++++ libX11-1.3/nls/compose.dir.pre	2009-10-04 09:54:54.948606747 +0200
 @@ -7,8 +7,11 @@
  XCOMM $XFree86: xc/nls/compose.dir,v 1.24 2003/08/06 14:04:00 eich Exp $
  XCOMM
@@ -838,13 +838,13 @@
  iso8859-1/Compose:		ss_ZA.ISO8859-1
  iso8859-1/Compose:		st_ZA.ISO8859-1
  iso8859-1/Compose:		sv_FI.ISO8859-1
-@@ -211,39 +239,52 @@
+@@ -211,36 +239,47 @@
  iso8859-1/Compose:		sv_SE.ISO8859-1
  iso8859-15/Compose:		sv_SE.ISO8859-15
  tscii-0/Compose:		ta_IN.TSCII-0
 -koi8-c/Compose:			tg_TJ.KOI8-C
 +koi8-c/Compose:			tg_TJ.KOI8-K
-+XCOMM koi8-t/Compose:			tg_TJ.KOI8-T
++XCOMM koi8-t/Compose:		tg_TJ.KOI8-T
  iso8859-1/Compose:		tl_PH.ISO8859-1
 -iso8859-15/Compose:		tn_ZA.ISO8859-15
 +iso8859-10/Compose:		tn_ZA.ISO8859-10
@@ -863,10 +863,8 @@
  vi_VN.viscii/Compose:		vi_VN.VISCII
  vi_VN.tcvn/Compose:		vi_VN.TCVN
  iso8859-1/Compose:		wa_BE.ISO8859-1
-+iso8859-15/Compose:		wa_BE.ISO8859-15
  iso8859-1/Compose:		xh_ZA.ISO8859-1
--microsoft-cp1255/Compose:	yi_US.CP1256
-+XCOMM microsoft-cp1255/Compose:	yi_US.CP1256
+ microsoft-cp1255/Compose:	yi_US.CP1256
  zh_CN/Compose:			zh_CN.eucCN
 -zh_CN/Compose:			zh_CN.GB2312
 -zh_CN.gbk/Compose:		zh_CN.GBK
@@ -896,11 +894,7 @@
  en_US.UTF-8/Compose:		ar_BH.UTF-8
  en_US.UTF-8/Compose:		ar_DZ.UTF-8
  en_US.UTF-8/Compose:		ar_EG.UTF-8
-+en_US.UTF-8/Compose:		ar_IN.UTF-8
- 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
-@@ -253,22 +294,25 @@
+@@ -254,23 +293,26 @@
  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
@@ -908,7 +902,8 @@
 +en_US.UTF-8/Compose:		ar_SY.UTF-8
  en_US.UTF-8/Compose:		ar_TN.UTF-8
  en_US.UTF-8/Compose:		ar_YE.UTF-8
--en_US.UTF-8/Compose:		bs_BA.UTF-8
+ en_US.UTF-8/Compose:		bo_IN.UTF-8
+ en_US.UTF-8/Compose:		bs_BA.UTF-8
  en_US.UTF-8/Compose:		az_AZ.UTF-8
 -en_US.UTF-8/Compose:		a3_AZ.UTF-8
  en_US.UTF-8/Compose:		be_BY.UTF-8
@@ -916,7 +911,6 @@
 +en_US.UTF-8/Compose:		bn_BD.UTF-8
  en_US.UTF-8/Compose:		bn_IN.UTF-8
  en_US.UTF-8/Compose:		br_FR.UTF-8
-+en_US.UTF-8/Compose:		bs_BA.UTF-8
 +en_US.UTF-8/Compose:		byn_ER.UTF-8
  en_US.UTF-8/Compose:		ca_AD.UTF-8
  en_US.UTF-8/Compose:		ca_ES.UTF-8
@@ -929,7 +923,7 @@
  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
-@@ -279,17 +323,24 @@
+@@ -281,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
@@ -955,7 +949,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
-@@ -323,12 +374,14 @@
+@@ -325,6 +374,7 @@
  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
@@ -963,19 +957,16 @@
  en_US.UTF-8/Compose:		gl_ES.UTF-8
  en_US.UTF-8/Compose:		gu_IN.UTF-8
  en_US.UTF-8/Compose:		gv_GB.UTF-8
- en_US.UTF-8/Compose:		he_IL.UTF-8
+@@ -332,6 +382,7 @@
  en_US.UTF-8/Compose:		hi_IN.UTF-8
+ en_US.UTF-8/Compose:		hne_IN.UTF-8
  en_US.UTF-8/Compose:		hr_HR.UTF-8
 +en_US.UTF-8/Compose:		hsb_DE.UTF-8
  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
-@@ -340,55 +393,76 @@
- en_US.UTF-8/Compose:		ka_GE.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
+@@ -349,6 +400,9 @@
+ en_US.UTF-8/Compose:		ks_IN at devanagari.UTF-8
  en_US.UTF-8/Compose:		kw_GB.UTF-8
  en_US.UTF-8/Compose:		ky_KG.UTF-8
 +en_US.UTF-8/Compose:		lg_UG.UTF-8
@@ -984,15 +975,15 @@
  en_US.UTF-8/Compose:		lo_LA.UTF-8
  en_US.UTF-8/Compose:		lt_LT.UTF-8
  en_US.UTF-8/Compose:		lv_LV.UTF-8
+@@ -356,26 +410,28 @@
  en_US.UTF-8/Compose:		mi_NZ.UTF-8
  en_US.UTF-8/Compose:		mk_MK.UTF-8
-+en_US.UTF-8/Compose:		ml_IN.UTF-8
+ en_US.UTF-8/Compose:		ml_IN.UTF-8
 +en_US.UTF-8/Compose:		mn_MN.UTF-8
-+en_US.UTF-8/Compose:		mr_IN.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:		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
@@ -1004,9 +995,10 @@
  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:		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:		pa_PK.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
@@ -1015,13 +1007,14 @@
  pt_BR.UTF-8/Compose:		pt_BR.UTF-8
  en_US.UTF-8/Compose:		pt_PT.UTF-8
  en_US.UTF-8/Compose:		ro_RO.UTF-8
- en_US.UTF-8/Compose:		ru_RU.UTF-8
- en_US.UTF-8/Compose:		ru_UA.UTF-8
- en_US.UTF-8/Compose:		rw_RW.UTF-8
+@@ -385,15 +441,20 @@
+ en_US.UTF-8/Compose:		sa_IN.UTF-8
+ en_US.UTF-8/Compose:		sd_IN.UTF-8
+ en_US.UTF-8/Compose:		sd_IN at devanagari.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
@@ -1036,9 +1029,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
- en_US.UTF-8/Compose:		sv_SE.UTF-8
- en_US.UTF-8/Compose:		ta_IN.UTF-8
-+en_US.UTF-8/Compose:		te_IN.UTF-8
+@@ -402,8 +463,13 @@
+ en_US.UTF-8/Compose:		te_IN.UTF-8
  en_US.UTF-8/Compose:		tg_TJ.UTF-8
  en_US.UTF-8/Compose:		th_TH.UTF-8
 +en_US.UTF-8/Compose:		ti_ER.UTF-8
@@ -1051,26 +1043,22 @@
  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
-@@ -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
--en_US.UTF-8/Compose:		yi_US.UTF-8
+@@ -417,6 +483,5 @@
  en_US.UTF-8/Compose:		xh_ZA.UTF-8
-+en_US.UTF-8/Compose:		yi_US.UTF-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.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 @@
+ en_US.UTF-8/Compose:		ne_NP.UTF-8
+ 
+--- libX11-1.3/nls/locale.alias.pre.orig	2009-09-03 03:12:28.000000000 +0200
++++ libX11-1.3/nls/locale.alias.pre	2009-10-04 10:34:53.228614289 +0200
+@@ -17,17 +17,31 @@
  Cextend:					en_US.ISO8859-1
  Cextend.en:					en_US.ISO8859-1
  English_United-States.437:			C
 +aa_DJ:						aa_DJ.ISO8859-1
 +aa_DJ.iso88591:					aa_DJ.ISO8859-1
 +aa_DJ.ISO-8859-1:				aa_DJ.ISO8859-1
-+aa_DJ.ISO_8859-1:				aa_DJ.ISO8859-1
 +aa_DJ.utf8:					aa_DJ.UTF-8
 +aa_ER:						aa_ER.UTF-8
 +aa_ER.utf8:					aa_ER.UTF-8
@@ -1090,115 +1078,37 @@
  af_ZA.iso88591:					af_ZA.ISO8859-1
  af_ZA.ISO-8859-1:				af_ZA.ISO8859-1
 -af_ZA.utf8:				af_ZA.UTF-8
-+af_ZA.ISO_8859-1:				af_ZA.ISO8859-1
  am:						am_ET.UTF-8
  am_ET:						am_ET.UTF-8
 +am_ET.utf8:					am_ET.UTF-8
 +an_ES:						an_ES.ISO8859-15
 +an_ES.iso885915:				an_ES.ISO8859-15
 +an_ES.ISO-8859-15:				an_ES.ISO8859-15
-+an_ES.ISO_8859-15:				an_ES.ISO8859-15
 +an_ES.utf8:					an_ES.UTF-8
  ar:						ar_AA.ISO8859-6
  ar_AA:						ar_AA.ISO8859-6
  AR_AA:						ar_AA.ISO8859-6
-@@ -38,78 +55,101 @@
- ar_AE:						ar_AE.ISO8859-6
- ar_AE.iso88596:					ar_AE.ISO8859-6
- ar_AE.ISO-8859-6:				ar_AE.ISO8859-6
-+ar_AE.ISO_8859-6:				ar_AE.ISO8859-6
- ar_AE.utf8:					ar_AE.UTF-8
- ar_BH:						ar_BH.ISO8859-6
- ar_BH.iso88596:					ar_BH.ISO8859-6
- ar_BH.ISO-8859-6:				ar_BH.ISO8859-6
-+ar_BH.ISO_8859-6:				ar_BH.ISO8859-6
- ar_BH.utf8:					ar_BH.UTF-8
- ar_DZ:						ar_DZ.ISO8859-6
- ar_DZ.iso88596:					ar_DZ.ISO8859-6
- ar_DZ.ISO-8859-6:				ar_DZ.ISO8859-6
-+ar_DZ.ISO_8859-6:				ar_DZ.ISO8859-6
- ar_DZ.utf8:					ar_DZ.UTF-8
- ar_EG:						ar_EG.ISO8859-6
+@@ -51,8 +65,8 @@
  ar_EG.iso88596:					ar_EG.ISO8859-6
  ar_EG.ISO-8859-6:				ar_EG.ISO8859-6
-+ar_EG.ISO_8859-6:				ar_EG.ISO8859-6
  ar_EG.utf8:					ar_EG.UTF-8
 +ar_IN:						ar_IN.UTF-8
-+ar_IN.utf8:					ar_IN.UTF-8
+ ar_IN.utf8:					ar_IN.UTF-8
+-ar_IN.UTF-8:					ar_IN.UTF-8
  ar_IQ:						ar_IQ.ISO8859-6
  ar_IQ.iso88596:					ar_IQ.ISO8859-6
  ar_IQ.ISO-8859-6:				ar_IQ.ISO8859-6
-+ar_IQ.ISO_8859-6:				ar_IQ.ISO8859-6
- ar_IQ.utf8:					ar_IQ.UTF-8
- ar_JO:						ar_JO.ISO8859-6
- ar_JO.iso88596:					ar_JO.ISO8859-6
- ar_JO.ISO-8859-6:				ar_JO.ISO8859-6
-+ar_JO.ISO_8859-6:				ar_JO.ISO8859-6
- ar_JO.utf8:					ar_JO.UTF-8
- ar_KW:						ar_KW.ISO8859-6
- ar_KW.iso88596:					ar_KW.ISO8859-6
--ar_KW.iso88596:					ar_KW.ISO8859-6
- ar_KW.ISO-8859-6:				ar_KW.ISO8859-6
-+ar_KW.ISO_8859-6:				ar_KW.ISO8859-6
- ar_KW.utf8:					ar_KW.UTF-8
- ar_LB:						ar_LB.ISO8859-6
- ar_LB.iso88596:					ar_LB.ISO8859-6
- ar_LB.ISO-8859-6:				ar_LB.ISO8859-6
-+ar_LB.ISO_8859-6:				ar_LB.ISO8859-6
- ar_LB.utf8:					ar_LB.UTF-8
- ar_LY:						ar_LY.ISO8859-6
- ar_LY.iso88596:					ar_LY.ISO8859-6
- ar_LY.ISO-8859-6:				ar_LY.ISO8859-6
-+ar_LY.ISO_8859-6:				ar_LY.ISO8859-6
- ar_LY.utf8:					ar_LY.UTF-8
- ar_MA:						ar_MA.ISO8859-6
- ar_MA.iso88596:					ar_MA.ISO8859-6
- ar_MA.ISO-8859-6:				ar_MA.ISO8859-6
-+ar_MA.ISO_8859-6:				ar_MA.ISO8859-6
- ar_MA.utf8:					ar_MA.UTF-8
- ar_OM:						ar_OM.ISO8859-6
- ar_OM.iso88596:					ar_OM.ISO8859-6
- ar_OM.ISO-8859-6:				ar_OM.ISO8859-6
-+ar_OM.ISO_8859-6:				ar_OM.ISO8859-6
- ar_OM.utf8:					ar_OM.UTF-8
- ar_QA:						ar_QA.ISO8859-6
- ar_QA.iso88596:					ar_QA.ISO8859-6
- ar_QA.ISO-8859-6:				ar_QA.ISO8859-6
-+ar_QA.ISO_8859-6:				ar_QA.ISO8859-6
- ar_QA.utf8:					ar_QA.UTF-8
- ar_SA:						ar_SA.ISO8859-6
- ar_SA.iso88596:					ar_SA.ISO8859-6
- ar_SA.ISO-8859-6:				ar_SA.ISO8859-6
-+ar_SA.ISO_8859-6:				ar_SA.ISO8859-6
- ar_SA.utf8:					ar_SA.UTF-8
- ar_SD:						ar_SD.ISO8859-6
- ar_SD.iso88596:					ar_SD.ISO8859-6
- ar_SD.ISO-8859-6:				ar_SD.ISO8859-6
-+ar_SD.ISO_8859-6:				ar_SD.ISO8859-6
- ar_SD.utf8:					ar_SD.UTF-8
- ar_SY:						ar_SY.ISO8859-6
- ar_SY.iso88596:					ar_SY.ISO8859-6
- ar_SY.ISO-8859-6:				ar_SY.ISO8859-6
-+ar_SY.ISO_8859-6:				ar_SY.ISO8859-6
- ar_SY.utf8:					ar_SY.UTF-8
- ar_TN:						ar_TN.ISO8859-6
- ar_TN.iso88596:					ar_TN.ISO8859-6
- ar_TN.ISO-8859-6:				ar_TN.ISO8859-6
-+ar_TN.ISO_8859-6:				ar_TN.ISO8859-6
+@@ -103,14 +117,18 @@
  ar_TN.utf8:					ar_TN.UTF-8
--as:						as_IN.UTF-8
--as_IN.utf8:					as_IN.UTF-8
+ as:						as_IN.UTF-8
+ as_IN.utf8:					as_IN.UTF-8
 -as_IN.UTF-8:					as_IN.UTF-8
  ar_YE:						ar_YE.ISO8859-6
  ar_YE.iso88596:					ar_YE.ISO8859-6
  ar_YE.ISO-8859-6:				ar_YE.ISO8859-6
-+ar_YE.ISO_8859-6:				ar_YE.ISO8859-6
  ar_YE.utf8:					ar_YE.UTF-8
 -az:						az_AZ.ISO8859-9E
 -az_AZ:						az_AZ.ISO8859-9E
-+as:						as_IN.UTF-8
-+as_IN.utf8:					as_IN.UTF-8
-+as_IN.UTF-8:					as_IN.UTF-8
 +az:						az_AZ.UTF-8
 +az_AZ:						az_AZ.UTF-8
  az_AZ.iso88599e:				az_AZ.ISO8859-9E
@@ -1210,7 +1120,7 @@
  be:						be_BY.CP1251
  be at latin:					be_BY.UTF-8 at latin
  be_BY:						be_BY.CP1251
-@@ -126,28 +166,36 @@
+@@ -127,14 +145,14 @@
  bg_BG.microsoftcp1251:				bg_BG.CP1251
  bg_BG.microsoft-cp1251:				bg_BG.CP1251
  bg_BG.MICROSOFT-CP1251:				bg_BG.CP1251
@@ -1224,50 +1134,38 @@
 +bn_IN:						bn_IN.UTF-8
  bn_IN.utf8:					bn_IN.UTF-8
 -bn_IN.UTF-8:					bn_IN.UTF-8
+ bo_IN.utf8:					bo_IN.UTF-8
+-bo_IN.UTF-8:					bo_IN.UTF-8
  br:						br_FR.ISO8859-1
  br_FR:						br_FR.ISO8859-1
  br_FR.iso88591:					br_FR.ISO8859-1
- br_FR.ISO-8859-1:				br_FR.ISO8859-1
-+br_FR.ISO_8859-1:				br_FR.ISO8859-1
+@@ -142,9 +160,12 @@
  br_FR.iso885914:				br_FR.ISO8859-14
  br_FR.ISO-8859-14:				br_FR.ISO8859-14
-+br_FR.ISO_8859-14:				br_FR.ISO8859-14
  br_FR.iso885915:				br_FR.ISO8859-15
 +br_FR.iso885915 at euro:				br_FR.ISO8859-15
  br_FR.ISO-8859-15:				br_FR.ISO8859-15
-+br_FR.ISO_8859-15:				br_FR.ISO8859-15
  br_FR.ISO-8859-15 at euro:				br_FR.ISO8859-15
-+br_FR.ISO_8859-15 at euro:				br_FR.ISO8859-15
  br_FR at euro:					br_FR.ISO8859-15
 +br_FR.utf8:					br_FR.UTF-8
++br_FR.utf8 at euro:				br_FR.UTF-8
  br_FR.UTF-8 at euro:				br_FR.UTF-8
  bs:						bs_BA.ISO8859-2
  bs_BA:						bs_BA.ISO8859-2
- bs_BA.iso88592:					bs_BA.ISO8859-2
- bs_BA.ISO-8859-2:				bs_BA.ISO8859-2
- bs_BA.ISO_8859-2:				bs_BA.ISO8859-2
-+bs_BA.utf8:					bs_BA.UTF-8
- ca:						ca_ES.ISO8859-1
- ca_AD:						ca_AD.ISO8859-1
- ca_AD at euro:					ca_AD.ISO8859-15
-@@ -162,11 +210,15 @@
- ca_ES at euro:					ca_ES.ISO8859-15
+@@ -166,10 +187,11 @@
  ca_ES.iso88591:					ca_ES.ISO8859-1
  ca_ES.ISO-8859-1:				ca_ES.ISO8859-1
-+ca_ES.ISO_8859-1:				ca_ES.ISO8859-1
  ca_ES.iso885915:				ca_ES.ISO8859-15
 -ca_ES.utf8:					ca_ES.UTF-8
 +ca_ES.iso885915 at euro:				ca_ES.ISO8859-15
  ca_ES.ISO-8859-15:				ca_ES.ISO8859-15
-+ca_ES.ISO_8859-15:				ca_ES.ISO8859-15
  ca_ES.ISO-8859-15 at euro:				ca_ES.ISO8859-15
-+ca_ES.ISO_8859-15 at euro:				ca_ES.ISO8859-15
  ca_ES.UTF-8 at euro:				ca_ES.UTF-8
 +ca_ES.utf8:					ca_ES.UTF-8
  ca_FR:						ca_FR.ISO8859-1
  ca_FR at euro:					ca_FR.ISO8859-15
  ca_FR.iso88591:					ca_FR.ISO8859-1
-@@ -194,19 +246,26 @@
+@@ -197,19 +219,23 @@
  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
@@ -1285,13 +1183,10 @@
 +cy_GB:						cy_GB.ISO8859-14
  cy_GB.iso88591:					cy_GB.ISO8859-1
  cy_GB.ISO-8859-1:				cy_GB.ISO8859-1
-+cy_GB.ISO_8859-1:				cy_GB.ISO8859-1
  cy_GB.iso885914:				cy_GB.ISO8859-14
  cy_GB.ISO-8859-14:				cy_GB.ISO8859-14
-+cy_GB.ISO_8859-14:				cy_GB.ISO8859-14
  cy_GB.iso885915:				cy_GB.ISO8859-15
  cy_GB.ISO-8859-15:				cy_GB.ISO8859-15
-+cy_GB.ISO_8859-15:				cy_GB.ISO8859-15
 +cy_GB.utf8:					cy_GB.UTF-8
 +XCOMM cz is an old name for Czech (now cs), and should be deleted in the future.
 +cz:						cs_CZ.ISO8859-2
@@ -1301,7 +1196,7 @@
  da:						da_DK.ISO8859-1
  da.ISO8859-15:					da_DK.ISO8859-15
  da_DK:						da_DK.ISO8859-1
-@@ -230,18 +289,23 @@
+@@ -233,18 +259,22 @@
  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
@@ -1312,7 +1207,6 @@
  de_AT.utf8:					de_AT.UTF-8
  de_BE:						de_BE.ISO8859-1
 +de_BE.iso885915 at euro:				de_BE.ISO8859-15
-+de_BE.ISO_8859-15 at euro:				de_BE.ISO8859-15
 +de_BE.ISO-8859-15 at euro:				de_BE.ISO8859-15
  de_BE at euro:					de_BE.ISO8859-15
 +de_BE.utf8:					de_BE.UTF-8
@@ -1326,22 +1220,19 @@
  de_BE.UTF-8 at euro:				de_BE.UTF-8
  de_CH:						de_CH.ISO8859-1
  de_CH.iso88591:					de_CH.ISO8859-1
-@@ -263,7 +327,9 @@
+@@ -266,6 +296,7 @@
  de_DE.ISO_8859-15:				de_DE.ISO8859-15
  de_DE.8859-15:					de_DE.ISO8859-15
  de_DE.8859-15 at euro:				de_DE.ISO8859-15
 +de_DE.iso885915 at euro:				de_DE.ISO8859-15
  de_DE.ISO-8859-15 at euro:				de_DE.ISO8859-15
-+de_DE.ISO_8859-15 at euro:				de_DE.ISO8859-15
  de_DE.UTF-8 at euro:				de_DE.UTF-8
  de_DE.utf8:					de_DE.UTF-8
- de_LU:						de_LU.ISO8859-1
-@@ -271,22 +337,31 @@
+@@ -274,22 +305,29 @@
  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
 +de_LU.iso885915 at euro:				de_LU.ISO8859-15
-+de_LU.ISO_8859-15 at euro:				de_LU.ISO8859-15
 +de_LU.ISO-8859-15 at euro:				de_LU.ISO8859-15
  de_LU.iso885915:				de_LU.ISO8859-15
  de_LU.ISO_8859-15:				de_LU.ISO8859-15
@@ -1368,16 +1259,14 @@
  el_GR.iso88597:					el_GR.ISO8859-7
  el_GR.ISO-8859-7:				el_GR.ISO8859-7
 -el_GR at euro:					el_GR.ISO8859-15
-+el_GR.ISO_8859-7:				el_GR.ISO8859-7
 +el_GR at euro:					el_GR.UTF-8
  el_GR.utf8:					el_GR.UTF-8
  en:						en_US.ISO8859-1
  en.ISO-8859-1:					en_US.ISO8859-1
-@@ -301,11 +376,18 @@
+@@ -304,11 +342,16 @@
  en_BW:						en_BW.ISO8859-1
  en_BW.iso88591:					en_BW.ISO8859-1
  en_BW.ISO-8859-1:				en_BW.ISO8859-1
-+en_BW.ISO_8859-1:				en_BW.ISO8859-1
 +en_BW.utf8:					en_BW.UTF-8
  en_CA:						en_CA.ISO8859-1
  en_CA.iso88591:					en_CA.ISO8859-1
@@ -1387,12 +1276,11 @@
 +en_DK:						en_DK.ISO8859-1
 +en_DK.iso88591:					en_DK.ISO8859-1
 +en_DK.ISO-8859-1:				en_DK.ISO8859-1
-+en_DK.ISO_8859-1:				en_DK.ISO8859-1
 +en_DK.utf8:					en_DK.UTF-8
  en_GB:						en_GB.ISO8859-1
  en_GB.88591:					en_GB.ISO8859-1
  en_GB.88591.en:					en_GB.ISO8859-1
-@@ -316,31 +398,45 @@
+@@ -319,21 +362,26 @@
  en_GB.ISO-8859-15:				en_GB.ISO8859-15
  en_GB.utf8:					en_GB.UTF-8
  en_UK:						en_GB.ISO8859-1
@@ -1403,18 +1291,14 @@
  en_HK:						en_HK.ISO8859-1
  en_HK.iso88591:					en_HK.ISO8859-1
  en_HK.ISO-8859-1:				en_HK.ISO8859-1
-+en_HK.ISO_8859-1:				en_HK.ISO8859-1
 +en_HK.utf8:					en_HK.UTF-8
  en_IE:						en_IE.ISO8859-1
  en_IE.iso88591:					en_IE.ISO8859-1
  en_IE.ISO-8859-1:				en_IE.ISO8859-1
-+en_IE.ISO_8859-1:				en_IE.ISO8859-1
  en_IE.iso885915:				en_IE.ISO8859-15
  en_IE.ISO-8859-15:				en_IE.ISO8859-15
-+en_IE.ISO_8859-15:				en_IE.ISO8859-15
 +en_IE.iso885915 at euro:				en_IE.ISO8859-15
  en_IE.ISO-8859-15 at euro:				en_IE.ISO8859-15
-+en_IE.ISO_8859-15 at euro:				en_IE.ISO8859-15
  en_IE at euro:					en_IE.ISO8859-15
  en_IE.UTF-8 at euro:				en_IE.UTF-8
  en_IE.utf8:					en_IE.UTF-8
@@ -1423,42 +1307,22 @@
  en_NZ:						en_NZ.ISO8859-1
  en_NZ.iso88591:					en_NZ.ISO8859-1
  en_NZ.ISO-8859-1:				en_NZ.ISO8859-1
-+en_NZ.ISO_8859-1:				en_NZ.ISO8859-1
- en_NZ.utf8:					en_NZ.UTF-8
+@@ -341,9 +389,11 @@
  en_PH:						en_PH.ISO8859-1
  en_PH.iso88591:					en_PH.ISO8859-1
  en_PH.ISO-8859-1:				en_PH.ISO8859-1
-+en_PH.ISO_8859-1:				en_PH.ISO8859-1
 +en_PH.utf8:					en_PH.UTF-8
  en_SG:						en_SG.ISO8859-1
  en_SG.iso88591:					en_SG.ISO8859-1
  en_SG.ISO-8859-1:				en_SG.ISO8859-1
-+en_SG.ISO_8859-1:				en_SG.ISO8859-1
 +en_SG.utf8:					en_SG.UTF-8
  en_US:						en_US.ISO8859-1
  EN_US:						en_US.ISO8859-1
  en_US.88591:					en_US.ISO8859-1
-@@ -354,15 +450,6 @@
- en_US.ISO8859-15 at euro:				en_US.ISO8859-15
- en_US.utf8:					en_US.UTF-8
- EN_US.UTF-8:					en_US.UTF-8
--en_US.88591.en:					en_US.ISO8859-1
--en_US.iso88591:					en_US.ISO8859-1
--en_US.ISO-8859-1:				en_US.ISO8859-1
--en_US.ISO_8859-1:				en_US.ISO8859-1
--en_US.iso885915:				en_US.ISO8859-15
--en_US.8859-15:					en_US.ISO8859-15
--en_US.ISO8859-15 at euro:				en_US.ISO8859-15
--en_US.utf8:					en_US.UTF-8
--EN_US.UTF-8:					en_US.UTF-8
- en_ZA:						en_ZA.ISO8859-1
- en_ZA.88591:					en_ZA.ISO8859-1
- en_ZA.88591.en:					en_ZA.ISO8859-1
-@@ -375,36 +462,45 @@
+@@ -369,11 +419,12 @@
  en_ZW:						en_ZW.ISO8859-1
  en_ZW.iso88591:					en_ZW.ISO8859-1
  en_ZW.ISO-8859-1:				en_ZW.ISO8859-1
-+en_ZW.ISO_8859-1:				en_ZW.ISO8859-1
 +en_ZW.utf8:					en_ZW.UTF-8
  eo:						eo_XX.ISO8859-3
 -eo_EO:						eo_EO.ISO8859-3
@@ -1469,126 +1333,60 @@
 +eo_EO.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.ISO-8859-1:				es_BO.ISO8859-1
-+es_BO.ISO_8859-1:				es_BO.ISO8859-1
- es_BO.utf8:					es_BO.UTF-8
- 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.utf8:					es_CL.UTF-8
- es_CO:						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.utf8:					es_CO.UTF-8
- es_CR:						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.utf8:					es_CR.UTF-8
- es_DO:						es_DO.ISO8859-1
- es_DO.iso88591:					es_DO.ISO8859-1
- es_DO.ISO-8859-1:				es_DO.ISO8859-1
-+es_DO.ISO_8859-1:				es_DO.ISO8859-1
- es_DO.utf8:					es_DO.UTF-8
- es_EC:						es_EC.ISO8859-1
- es_EC.iso88591:					es_EC.ISO8859-1
-@@ -417,63 +513,79 @@
+@@ -411,6 +462,7 @@
  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
<<Diff was trimmed, longer than 597 lines>>

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



More information about the pld-cvs-commit mailing list