ChangeLog | 378 ++++++++++++-
configure.ac | 10
cpprules.in | 1
debian/changelog | 23
debian/patches/003_recognize_glibc_2.3.2_locale_names.diff | 198 ++----
debian/patches/006_tailor_pt_BR.UTF-8_Compose.diff | 8
debian/patches/008_remove_ko_Compose.diff | 4
debian/patches/009_remove_th_Compose.diff | 15
debian/patches/012_ru_RU_UTF-8_XLC_LOCALE.diff | 237 --------
debian/patches/015_russian_locale_alias.diff | 6
debian/patches/series | 2
debian/xsfbs/repack.sh | 32 +
debian/xsfbs/xsfbs.mk | 29
debian/xsfbs/xsfbs.sh | 66 --
include/X11/Xlibint.h | 2
man/XCreateColormap.man | 2
man/XCreateFontCursor.man | 2
man/XReadBitmapFile.man | 2
modules/lc/def/lcDefConv.c | 2
modules/lc/gen/lcGenConv.c | 2
modules/lc/xlocale/lcJis.c | 2
nls/Makefile.am | 2
nls/compose.dir.pre | 11
nls/el_GR.UTF-8/Compose.pre | 8
nls/en_US.UTF-8/Compose.pre | 12
nls/fi_FI.UTF-8/Compose.pre | 8
nls/fi_FI.UTF-8/Makefile.am | 2
nls/iso8859-1/Compose.pre | 16
nls/iso8859-15/Compose.pre | 8
nls/iso8859-9/Compose.pre | 8
nls/iso8859-9e/Compose.pre | 8
nls/locale.alias.pre | 97 +--
nls/locale.dir.pre | 12
nls/pt_BR.UTF-8/Compose.pre | 8
nls/ru_RU.UTF-8/Compose.pre | 1
nls/ru_RU.UTF-8/Makefile.am | 3
nls/ru_RU.UTF-8/XI18N_OBJS | 7
nls/ru_RU.UTF-8/XLC_LOCALE.pre | 169 +++++
src/CrGlCur.c | 4
src/ErrDes.c | 2
src/ImUtil.c | 2
src/OpenDis.c | 4
src/ParseGeom.c | 18
src/Region.c | 146 -----
src/XErrorDB | 58 +
src/XlibInt.c | 12
src/Xrm.c | 6
src/locking.c | 107 +--
src/util/makekeys.c | 16
src/xcb_io.c | 4
src/xkb/XKBBind.c | 2
src/xlibi18n/lcUniConv/ksc5601.h | 12
x11.pc.in | 2
53 files changed, 969 insertions(+), 829 deletions(-)
New commits:
commit b06a8590acbb4f3ee91f74dde8ac59a31bc46f76
Author: Julien Cristau <jcris...@debian.org>
Date: Wed Apr 8 12:26:41 2009 +0100
Comment out the th_TH.UTF-8 entry from compose.dir
This allows Thai XIM as default for X apps (closes: #520509).
Thanks, Theppitak Karoonboonyanan!
diff --git a/debian/changelog b/debian/changelog
index 44e5c25..503cf48 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,9 @@ libx11 (2:1.2.1-1) UNRELEASED; urgency=low
* 003_recognize_glibc_2.3.2_locale_names.diff: don't comment out the eo_XX
entries from compose.dir and locale.dir (closes: #479058). Thanks, Luiz
Portella!
+ * 009_remove_th_Compose.diff: new patch, comment out the th_TH.UTF-8 entry
+ from compose.dir, to allow Thai XIM as default for X apps
+ (closes: #520509). Thanks, Theppitak Karoonboonyanan!
-- Julien Cristau <jcris...@debian.org> Wed, 08 Apr 2009 02:37:36 +0200
diff --git a/debian/patches/009_remove_th_Compose.diff
b/debian/patches/009_remove_th_Compose.diff
new file mode 100644
index 0000000..7e18df1
--- /dev/null
+++ b/debian/patches/009_remove_th_Compose.diff
@@ -0,0 +1,15 @@
+Index: libx11/nls/compose.dir.pre
+===================================================================
+--- libx11.orig/nls/compose.dir.pre
++++ libx11/nls/compose.dir.pre
+@@ -479,7 +479,9 @@
+ en_US.UTF-8/Compose: ta_IN.UTF-8
+ 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
++XCOMM Following entry commented to allow Thai XIM as default for X apps
++XCOMM See Debian bug#520509
++XCOMM en_US.UTF-8/Compose: th_TH.UTF-8
+ en_US.UTF-8/Compose: ti_ER.UTF-8
+ en_US.UTF-8/Compose: ti_ET.UTF-8
+ en_US.UTF-8/Compose: tig_ER.UTF-8
diff --git a/debian/patches/series b/debian/patches/series
index d68a508..fdf0075 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,4 +3,5 @@
006_tailor_pt_BR.UTF-8_Compose.diff
007_iso8859-15_Compose_fix.diff
008_remove_ko_Compose.diff
+009_remove_th_Compose.diff
015_russian_locale_alias.diff
commit 61c56c33da330e4ef84c3a1885d8f5cd06b0c683
Author: Julien Cristau <jcris...@debian.org>
Date: Wed Apr 8 12:19:26 2009 +0100
Refresh patch
diff --git a/debian/patches/008_remove_ko_Compose.diff
b/debian/patches/008_remove_ko_Compose.diff
index 6268789..e500a28 100644
--- a/debian/patches/008_remove_ko_Compose.diff
+++ b/debian/patches/008_remove_ko_Compose.diff
@@ -1,6 +1,8 @@
+Index: libx11/nls/compose.dir.pre
+===================================================================
--- libx11.orig/nls/compose.dir.pre
+++ libx11/nls/compose.dir.pre
-@@ -180,7 +180,8 @@
+@@ -177,7 +177,8 @@
iso8859-14/Compose: kw_GB.ISO8859-14
iso8859-15/Compose: kw_GB.ISO8859-15
iso8859-10/Compose: lg_UG.ISO8859-10
commit 5589ee2a601ffd7caeee652020b3929a158f882f
Author: Julien Cristau <jcris...@debian.org>
Date: Wed Apr 8 12:17:03 2009 +0100
Don't comment out the eo_XX entries from compose.dir and locale.dir
Closes: #479058. Thanks, Luiz Portella!
diff --git a/debian/changelog b/debian/changelog
index 6ffb2a9..44e5c25 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,9 @@ libx11 (2:1.2.1-1) UNRELEASED; urgency=low
* 003_recognize_glibc_2.3.2_locale_names.diff: don't comment out the
microsoft-cp* entries from compose.dir (closes: #511354). Thanks, Sergei
Golovan!
+ * 003_recognize_glibc_2.3.2_locale_names.diff: don't comment out the eo_XX
+ entries from compose.dir and locale.dir (closes: #479058). Thanks, Luiz
+ Portella!
-- Julien Cristau <jcris...@debian.org> Wed, 08 Apr 2009 02:37:36 +0200
diff --git a/debian/patches/003_recognize_glibc_2.3.2_locale_names.diff
b/debian/patches/003_recognize_glibc_2.3.2_locale_names.diff
index 13ae52e..7f592a9 100644
--- a/debian/patches/003_recognize_glibc_2.3.2_locale_names.diff
+++ b/debian/patches/003_recognize_glibc_2.3.2_locale_names.diff
@@ -20,7 +20,7 @@ Major housecleaning of X11's locale support.
* Disable support for locales that are neither supported by the GNU C
Library, nor use standard ISO 639 language or 3166 territory codes. This
- includes Esperanto (eo_EO, eo_XX), and what I presume is Pennsylvania
+ includes Esperanto (eo_EO), and what I presume is Pennsylvania
"Dutch" (pd_DE, pd_US).
* Turn off intrusion of Nynorsk into Nyanja's ISO 639 space. (Nynorsk is
@@ -140,20 +140,15 @@ Index: libx11/nls/compose.dir.pre
iso8859-1/Compose: en_TT.ISO8859-1
iso8859-1/Compose: en_UK.ISO8859-1
iso8859-15/Compose: en_UK.ISO8859-15
-@@ -73,7 +98,11 @@
+@@ -73,6 +98,7 @@
iso8859-15/Compose: en_US.ISO8859-15
iso8859-1/Compose: en_ZA.ISO8859-1
iso8859-15/Compose: en_ZA.ISO8859-15
--iso8859-3/Compose: eo_XX.ISO8859-3
+iso8859-1/Compose: en_ZW.ISO8859-1
-+XCOMM Esperato (eo) is not supported by the GNU C Library and neither the
-+XCOMM EO nor XX territories exist in ISO 3166.
-+XCOMM iso8859-3/Compose: eo_EO.ISO8859-3
-+XCOMM iso8859-3/Compose: eo_XX.ISO8859-3
+ iso8859-3/Compose: eo_XX.ISO8859-3
iso8859-1/Compose: es_AR.ISO8859-1
iso8859-1/Compose: es_BO.ISO8859-1
- iso8859-1/Compose: es_CL.ISO8859-1
-@@ -92,6 +121,7 @@
+@@ -92,6 +118,7 @@
iso8859-1/Compose: es_PR.ISO8859-1
iso8859-1/Compose: es_PY.ISO8859-1
iso8859-1/Compose: es_SV.ISO8859-1
@@ -161,7 +156,7 @@ Index: libx11/nls/compose.dir.pre
iso8859-1/Compose: es_UY.ISO8859-1
iso8859-1/Compose: es_VE.ISO8859-1
iso8859-1/Compose: et_EE.ISO8859-1
-@@ -100,6 +130,8 @@
+@@ -100,6 +127,8 @@
iso8859-15/Compose: et_EE.ISO8859-15
iso8859-1/Compose: eu_ES.ISO8859-1
iso8859-15/Compose: eu_ES.ISO8859-15
@@ -170,7 +165,7 @@ Index: libx11/nls/compose.dir.pre
isiri-3342/Compose: fa_IR.ISIRI-3342
iso8859-1/Compose: fi_FI.ISO8859-1
iso8859-15/Compose: fi_FI.ISO8859-15
-@@ -133,11 +165,9 @@
+@@ -133,11 +162,9 @@
iso8859-2/Compose: hu_HU.ISO8859-2
armscii-8/Compose: hy_AM.ARMSCII-8
iso8859-1/Compose: id_ID.ISO8859-1
@@ -182,7 +177,7 @@ Index: libx11/nls/compose.dir.pre
iso8859-1/Compose: it_IT.ISO8859-1
iso8859-15/Compose: it_IT.ISO8859-15
ja/Compose: ja_JP.eucJP
-@@ -146,14 +176,20 @@
+@@ -146,14 +173,20 @@
georgian-academy/Compose: ka_GE.GEORGIAN-ACADEMY
georgian-ps/Compose: ka_GE.GEORGIAN-PS
iso8859-1/Compose: kl_GL.ISO8859-1
@@ -205,7 +200,7 @@ Index: libx11/nls/compose.dir.pre
iso8859-4/Compose: lt_LT.ISO8859-4
iso8859-13/Compose: lt_LT.ISO8859-13
iso8859-4/Compose: lv_LV.ISO8859-4
-@@ -180,25 +216,33 @@
+@@ -180,25 +213,33 @@
iso8859-15/Compose: ny_NO.ISO8859-15
iso8859-1/Compose: oc_FR.ISO8859-1
iso8859-15/Compose: oc_FR.ISO8859-15
@@ -243,7 +238,7 @@ Index: libx11/nls/compose.dir.pre
iso8859-2/Compose: sq_AL.ISO8859-2
iso8859-2/Compose: sr_CS.ISO8859-2
iso8859-5/Compose: sr_CS.ISO8859-5
-@@ -212,38 +256,57 @@
+@@ -212,38 +253,57 @@
iso8859-15/Compose: sv_SE.ISO8859-15
tscii-0/Compose: ta_IN.TSCII-0
koi8-c/Compose: tg_TJ.KOI8-C
@@ -307,7 +302,7 @@ Index: libx11/nls/compose.dir.pre
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,15 +316,18 @@
+@@ -253,15 +313,18 @@
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
@@ -327,7 +322,7 @@ Index: libx11/nls/compose.dir.pre
en_US.UTF-8/Compose: ca_AD.UTF-8
en_US.UTF-8/Compose: ca_ES.UTF-8
en_US.UTF-8/Compose: ca_FR.UTF-8
-@@ -279,18 +345,29 @@
+@@ -279,17 +342,25 @@
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
@@ -349,16 +344,11 @@ Index: libx11/nls/compose.dir.pre
en_US.UTF-8/Compose: en_UK.UTF-8
en_US.UTF-8/Compose: en_US.UTF-8
en_US.UTF-8/Compose: en_ZA.UTF-8
--en_US.UTF-8/Compose: eo_XX.UTF-8
+en_US.UTF-8/Compose: en_ZW.UTF-8
-+XCOMM Esperato (eo) is not supported by the GNU C Library and neither the
-+XCOMM EO nor XX territories exist in ISO 3166.
-+XCOMM en_US.UTF-8/Compose: eo_EO.UTF-8
-+XCOMM en_US.UTF-8/Compose: eo_XX.UTF-8
+ 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
- en_US.UTF-8/Compose: es_CL.UTF-8
-@@ -313,6 +390,7 @@
+@@ -313,6 +384,7 @@
en_US.UTF-8/Compose: es_VE.UTF-8
en_US.UTF-8/Compose: et_EE.UTF-8
en_US.UTF-8/Compose: eu_ES.UTF-8
@@ -366,7 +356,7 @@ Index: libx11/nls/compose.dir.pre
en_US.UTF-8/Compose: fa_IR.UTF-8
fi_FI.UTF-8/Compose: fi_FI.UTF-8
en_US.UTF-8/Compose: fo_FO.UTF-8
-@@ -323,6 +401,8 @@
+@@ -323,6 +395,8 @@
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
@@ -375,7 +365,7 @@ Index: libx11/nls/compose.dir.pre
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
-@@ -336,10 +416,13 @@
+@@ -336,10 +410,13 @@
en_US.UTF-8/Compose: it_CH.UTF-8
en_US.UTF-8/Compose: it_IT.UTF-8
en_US.UTF-8/Compose: iu_CA.UTF-8
@@ -389,7 +379,7 @@ Index: libx11/nls/compose.dir.pre
en_US.UTF-8/Compose: ko_KR.UTF-8
en_US.UTF-8/Compose: kw_GB.UTF-8
en_US.UTF-8/Compose: ky_KG.UTF-8
-@@ -348,8 +431,12 @@
+@@ -348,8 +425,12 @@
en_US.UTF-8/Compose: lv_LV.UTF-8
en_US.UTF-8/Compose: mi_NZ.UTF-8
en_US.UTF-8/Compose: mk_MK.UTF-8
@@ -402,7 +392,7 @@ Index: libx11/nls/compose.dir.pre
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
-@@ -357,11 +444,17 @@
+@@ -357,11 +438,17 @@
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
@@ -423,7 +413,7 @@ Index: libx11/nls/compose.dir.pre
en_US.UTF-8/Compose: ph_PH.UTF-8
en_US.UTF-8/Compose: pl_PL.UTF-8
en_US.UTF-8/Compose: pp_AN.UTF-8
-@@ -371,10 +464,14 @@
+@@ -371,10 +458,14 @@
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
@@ -438,7 +428,7 @@ Index: libx11/nls/compose.dir.pre
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
-@@ -385,8 +482,12 @@
+@@ -385,8 +476,12 @@
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
@@ -603,21 +593,18 @@ Index: libx11/nls/locale.dir.pre
iso8859-15/XLC_LOCALE: en_IN.ISO8859-15
iso8859-1/XLC_LOCALE: en_JM.ISO8859-1
iso8859-1/XLC_LOCALE: en_NZ.ISO8859-1
-@@ -88,8 +98,11 @@
+@@ -88,7 +98,9 @@
iso8859-15/XLC_LOCALE: en_US.ISO8859-15
iso8859-1/XLC_LOCALE: en_ZA.ISO8859-1
iso8859-15/XLC_LOCALE: en_ZA.ISO8859-15
-iso8859-3/XLC_LOCALE: eo_EO.ISO8859-3
--iso8859-3/XLC_LOCALE: eo_XX.ISO8859-3
+iso8859-1/XLC_LOCALE: en_ZW.ISO8859-1
-+XCOMM Esperato (eo) is not supported by the GNU C Library and neither the
-+XCOMM EO nor XX territories exist in ISO 3166.
++XCOMM The EO territory doesn't exist in ISO 3166.
+XCOMM iso8859-3/XLC_LOCALE: eo_EO.ISO8859-3
-+XCOMM iso8859-3/XLC_LOCALE: eo_XX.ISO8859-3
+ iso8859-3/XLC_LOCALE: eo_XX.ISO8859-3
iso8859-1/XLC_LOCALE: es_AR.ISO8859-1
iso8859-1/XLC_LOCALE: es_BO.ISO8859-1
- iso8859-1/XLC_LOCALE: es_CL.ISO8859-1
-@@ -117,6 +130,8 @@
+@@ -117,6 +129,8 @@
iso8859-15/XLC_LOCALE: et_EE.ISO8859-15
iso8859-1/XLC_LOCALE: eu_ES.ISO8859-1
iso8859-15/XLC_LOCALE: eu_ES.ISO8859-15
@@ -626,7 +613,7 @@ Index: libx11/nls/locale.dir.pre
isiri-3342/XLC_LOCALE: fa_IR.ISIRI-3342
iso8859-1/XLC_LOCALE: fi_FI.ISO8859-1
iso8859-15/XLC_LOCALE: fi_FI.ISO8859-15
-@@ -165,6 +180,7 @@
+@@ -165,6 +179,7 @@
iso8859-1/XLC_LOCALE: kw_GB.ISO8859-1
iso8859-14/XLC_LOCALE: kw_GB.ISO8859-14
iso8859-15/XLC_LOCALE: kw_GB.ISO8859-15
@@ -634,7 +621,7 @@ Index: libx11/nls/locale.dir.pre
ibm-cp1133/XLC_LOCALE: lo_LA.IBM-CP1133
mulelao-1/XLC_LOCALE: lo_LA.MULELAO-1
iso8859-4/XLC_LOCALE: lt_LT.ISO8859-4
-@@ -192,8 +208,12 @@
+@@ -192,8 +207,12 @@
iso8859-1/XLC_LOCALE: ny_NO.ISO8859-15
iso8859-1/XLC_LOCALE: oc_FR.ISO8859-1
iso8859-15/XLC_LOCALE: oc_FR.ISO8859-15
@@ -649,7 +636,7 @@ Index: libx11/nls/locale.dir.pre
iso8859-2/XLC_LOCALE: pl_PL.ISO8859-2
iso8859-1/XLC_LOCALE: pp_AN.ISO8859-1
iso8859-1/XLC_LOCALE: pt_BR.ISO8859-1
-@@ -203,11 +223,15 @@
+@@ -203,11 +222,15 @@
iso8859-5/XLC_LOCALE: ru_RU.ISO8859-5
microsoft-cp1251/XLC_LOCALE: ru_RU.CP1251
koi8-r/XLC_LOCALE: ru_RU.KOI8-R
@@ -665,7 +652,7 @@ Index: libx11/nls/locale.dir.pre
iso8859-2/XLC_LOCALE: sq_AL.ISO8859-2
iso8859-2/XLC_LOCALE: sr_CS.ISO8859-2
iso8859-5/XLC_LOCALE: sr_CS.ISO8859-5
-@@ -222,8 +246,8 @@
+@@ -222,8 +245,8 @@
iso8859-15/XLC_LOCALE: sv_SE.ISO8859-15
tscii-0/XLC_LOCALE: ta_IN.TSCII-0
koi8-c/XLC_LOCALE: tg_TJ.KOI8-C
@@ -675,7 +662,7 @@ Index: libx11/nls/locale.dir.pre
iso8859-1/XLC_LOCALE: tl_PH.ISO8859-1
iso8859-15/XLC_LOCALE: tn_ZA.ISO8859-15
iso8859-9/XLC_LOCALE: tr_TR.ISO8859-9
-@@ -234,6 +258,7 @@
+@@ -234,6 +257,7 @@
microsoft-cp1251/XLC_LOCALE: uk_UA.CP1251
koi8-u/XLC_LOCALE: uk_UA.KOI8-U
microsoft-cp1256/XLC_LOCALE: ur_PK.CP1256
@@ -683,7 +670,7 @@ Index: libx11/nls/locale.dir.pre
vi_VN.tcvn/XLC_LOCALE: vi_VN.TCVN
vi_VN.viscii/XLC_LOCALE: vi_VN.VISCII
iso8859-1/XLC_LOCALE: wa_BE.ISO8859-1
-@@ -249,10 +274,17 @@
+@@ -249,10 +273,17 @@
zh_HK.big5hkscs/XLC_LOCALE: zh_HK.Big5-HKSCS
zh_HK.big5hkscs/XLC_LOCALE: zh_HK.big5hkscs
zh_HK.big5hkscs/XLC_LOCALE: zh_HK.Big5HKSCS
@@ -701,7 +688,7 @@ Index: libx11/nls/locale.dir.pre
en_US.UTF-8/XLC_LOCALE: af_ZA.UTF-8
en_US.UTF-8/XLC_LOCALE: am_ET.UTF-8
en_US.UTF-8/XLC_LOCALE: ar_AA.UTF-8
-@@ -260,6 +292,7 @@
+@@ -260,6 +291,7 @@
en_US.UTF-8/XLC_LOCALE: ar_BH.UTF-8
en_US.UTF-8/XLC_LOCALE: ar_DZ.UTF-8
en_US.UTF-8/XLC_LOCALE: ar_EG.UTF-8
@@ -709,7 +696,7 @@ Index: libx11/nls/locale.dir.pre
en_US.UTF-8/XLC_LOCALE: ar_IQ.UTF-8
en_US.UTF-8/XLC_LOCALE: ar_JO.UTF-8
en_US.UTF-8/XLC_LOCALE: ar_KW.UTF-8
-@@ -276,12 +309,12 @@
+@@ -276,12 +308,12 @@
en_US.UTF-8/XLC_LOCALE: ar_YE.UTF-8
en_US.UTF-8/XLC_LOCALE: as_IN.UTF-8
en_US.UTF-8/XLC_LOCALE: az_AZ.UTF-8
@@ -723,7 +710,7 @@ Index: libx11/nls/locale.dir.pre
en_US.UTF-8/XLC_LOCALE: ca_AD.UTF-8
en_US.UTF-8/XLC_LOCALE: ca_ES.UTF-8
en_US.UTF-8/XLC_LOCALE: ca_FR.UTF-8
-@@ -300,19 +333,28 @@
+@@ -300,18 +332,26 @@
en_US.UTF-8/XLC_LOCALE: el_GR.UTF-8
en_US.UTF-8/XLC_LOCALE: en_AU.UTF-8
en_US.UTF-8/XLC_LOCALE: en_BE.UTF-8
@@ -745,16 +732,13 @@ Index: libx11/nls/locale.dir.pre
en_US.UTF-8/XLC_LOCALE: en_US.UTF-8
en_US.UTF-8/XLC_LOCALE: en_ZA.UTF-8
-en_US.UTF-8/XLC_LOCALE: eo_EO.UTF-8
--en_US.UTF-8/XLC_LOCALE: eo_XX.UTF-8
+en_US.UTF-8/XLC_LOCALE: en_ZW.UTF-8
-+XCOMM Esperato (eo) is not supported by the GNU C Library and neither the
-+XCOMM EO nor XX territories exist in ISO 3166.
++XCOMM The EO territory doesn't exist in ISO 3166.
+XCOMM en_US.UTF-8/XLC_LOCALE: eo_EO.UTF-8
-+XCOMM en_US.UTF-8/XLC_LOCALE: eo_XX.UTF-8
+ en_US.UTF-8/XLC_LOCALE: eo_XX.UTF-8
en_US.UTF-8/XLC_LOCALE: es_AR.UTF-8
en_US.UTF-8/XLC_LOCALE: es_BO.UTF-8
- en_US.UTF-8/XLC_LOCALE: es_CL.UTF-8
-@@ -335,6 +377,7 @@
+@@ -335,6 +375,7 @@
en_US.UTF-8/XLC_LOCALE: es_VE.UTF-8
en_US.UTF-8/XLC_LOCALE: et_EE.UTF-8
en_US.UTF-8/XLC_LOCALE: eu_ES.UTF-8
@@ -762,7 +746,7 @@ Index: libx11/nls/locale.dir.pre
en_US.UTF-8/XLC_LOCALE: fa_IR.UTF-8
fi_FI.UTF-8/XLC_LOCALE: fi_FI.UTF-8
en_US.UTF-8/XLC_LOCALE: fo_FO.UTF-8
-@@ -345,6 +388,8 @@
+@@ -345,6 +386,8 @@
en_US.UTF-8/XLC_LOCALE: fr_LU.UTF-8
en_US.UTF-8/XLC_LOCALE: ga_IE.UTF-8
en_US.UTF-8/XLC_LOCALE: gd_GB.UTF-8
@@ -771,7 +755,7 @@ Index: libx11/nls/locale.dir.pre
en_US.UTF-8/XLC_LOCALE: gl_ES.UTF-8
en_US.UTF-8/XLC_LOCALE: gu_IN.UTF-8
en_US.UTF-8/XLC_LOCALE: gv_GB.UTF-8
-@@ -358,10 +403,12 @@
+@@ -358,10 +401,12 @@
en_US.UTF-8/XLC_LOCALE: it_CH.UTF-8
en_US.UTF-8/XLC_LOCALE: it_IT.UTF-8
en_US.UTF-8/XLC_LOCALE: iu_CA.UTF-8
@@ -784,7 +768,7 @@ Index: libx11/nls/locale.dir.pre
en_US.UTF-8/XLC_LOCALE: kn_IN.UTF-8
ko_KR.UTF-8/XLC_LOCALE: ko_KR.UTF-8
en_US.UTF-8/XLC_LOCALE: kw_GB.UTF-8
-@@ -372,22 +419,30 @@
+@@ -372,22 +417,30 @@
en_US.UTF-8/XLC_LOCALE: mi_NZ.UTF-8
en_US.UTF-8/XLC_LOCALE: mk_MK.UTF-8
en_US.UTF-8/XLC_LOCALE: ml_IN.UTF-8
@@ -818,7 +802,7 @@ Index: libx11/nls/locale.dir.pre
en_US.UTF-8/XLC_LOCALE: ph_PH.UTF-8
en_US.UTF-8/XLC_LOCALE: pl_PL.UTF-8
en_US.UTF-8/XLC_LOCALE: pp_AN.UTF-8
-@@ -398,11 +453,13 @@
+@@ -398,11 +451,13 @@
en_US.UTF-8/XLC_LOCALE: ru_UA.UTF-8
en_US.UTF-8/XLC_LOCALE: rw_RW.UTF-8
en_US.UTF-8/XLC_LOCALE: se_NO.UTF-8
@@ -832,7 +816,7 @@ Index: libx11/nls/locale.dir.pre
en_US.UTF-8/XLC_LOCALE: sq_AL.UTF-8
en_US.UTF-8/XLC_LOCALE: sr_CS.UTF-8
en_US.UTF-8/XLC_LOCALE: sr_ME.UTF-8
-@@ -418,6 +475,7 @@
+@@ -418,6 +473,7 @@
th_TH.UTF-8/XLC_LOCALE: th_TH.UTF-8
en_US.UTF-8/XLC_LOCALE: ti_ER.UTF-8
en_US.UTF-8/XLC_LOCALE: ti_ET.UTF-8
commit d42d9a00446eb10e8f4493533157f9c47b879581
Author: Julien Cristau <jcris...@debian.org>
Date: Wed Apr 8 12:09:24 2009 +0100
Don't comment out the microsoft-cp* entries from compose.dir (closes:
#511354)
Thanks, Sergei Golovan!
diff --git a/debian/changelog b/debian/changelog
index e14e558..6ffb2a9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,9 @@ libx11 (2:1.2.1-1) UNRELEASED; urgency=low
* Patch 012_ru_RU_UTF-8_XLC_LOCALE.diff removed, applied upstream.
* Update patches 003_recognize_glibc_2.3.2_locale_names.diff,
006_tailor_pt_BR.UTF-8_Compose.diff and 015_russian_locale_alias.diff.
+ * 003_recognize_glibc_2.3.2_locale_names.diff: don't comment out the
+ microsoft-cp* entries from compose.dir (closes: #511354). Thanks, Sergei
+ Golovan!
-- Julien Cristau <jcris...@debian.org> Wed, 08 Apr 2009 02:37:36 +0200
diff --git a/debian/patches/003_recognize_glibc_2.3.2_locale_names.diff
b/debian/patches/003_recognize_glibc_2.3.2_locale_names.diff
index 59af1f6..13ae52e 100644
--- a/debian/patches/003_recognize_glibc_2.3.2_locale_names.diff
+++ b/debian/patches/003_recognize_glibc_2.3.2_locale_names.diff
@@ -95,13 +95,11 @@ Index: libx11/nls/compose.dir.pre
iso8859-6/Compose: ar_YE.ISO8859-6
iso8859-9e/Compose: az_AZ.ISO8859-9E
-koi8-c/Compose: a3_AZ.KOI8-C
--microsoft-cp1251/Compose: be_BY.CP1251
+koi8-c/Compose: az_AZ.KOI8-C
+iso8859-5/Compose: be_BY.ISO8859-5
-+XCOMM microsoft-cp1251/Compose: be_BY.CP1251
+ microsoft-cp1251/Compose: be_BY.CP1251
iso8859-5/Compose: bg_BG.ISO8859-5
--microsoft-cp1251/Compose: bg_BG.CP1251
-+XCOMM microsoft-cp1251/Compose: bg_BG.CP1251
+ microsoft-cp1251/Compose: bg_BG.CP1251
+koi8-r/Compose: bg_BG.KOI8-R
iso8859-1/Compose: br_FR.ISO8859-1
iso8859-14/Compose: br_FR.ISO8859-14
@@ -172,14 +170,7 @@ Index: libx11/nls/compose.dir.pre
isiri-3342/Compose: fa_IR.ISIRI-3342
iso8859-1/Compose: fi_FI.ISO8859-1
iso8859-15/Compose: fi_FI.ISO8859-15
-@@ -127,17 +159,15 @@
- iso8859-14/Compose: gv_GB.ISO8859-14
- iso8859-15/Compose: gv_GB.ISO8859-15
- iso8859-8/Compose: he_IL.ISO8859-8
--microsoft-cp1255/Compose: he_IL.CP1255
-+XCOMM microsoft-cp1255/Compose: he_IL.CP1255
- iscii-dev/Compose: hi_IN.ISCII-DEV
- iso8859-2/Compose: hr_HR.ISO8859-2
+@@ -133,11 +165,9 @@
iso8859-2/Compose: hu_HU.ISO8859-2
armscii-8/Compose: hy_AM.ARMSCII-8
iso8859-1/Compose: id_ID.ISO8859-1
@@ -214,16 +205,7 @@ Index: libx11/nls/compose.dir.pre
iso8859-4/Compose: lt_LT.ISO8859-4
iso8859-13/Compose: lt_LT.ISO8859-13
iso8859-4/Compose: lv_LV.ISO8859-4
-@@ -161,7 +197,7 @@
- iso8859-13/Compose: mi_NZ.ISO8859-13
- iso8859-5/Compose: mk_MK.ISO8859-5
- XCOMM mk_MK.UTF-8/Compose: mk_MK.UTF-8
--microsoft-cp1251/Compose: mk_MK.CP1251
-+XCOMM microsoft-cp1251/Compose: mk_MK.CP1251
- iso8859-1/Compose: ms_MY.ISO8859-1
- iso8859-3/Compose: mt_MT.ISO8859-3
- iso8859-1/Compose: nl_BE.ISO8859-1
-@@ -180,30 +216,38 @@
+@@ -180,25 +216,33 @@
iso8859-15/Compose: ny_NO.ISO8859-15
iso8859-1/Compose: oc_FR.ISO8859-1
iso8859-15/Compose: oc_FR.ISO8859-15
@@ -245,11 +227,10 @@ Index: libx11/nls/compose.dir.pre
iso8859-1/Compose: pt_PT.ISO8859-1
iso8859-15/Compose: pt_PT.ISO8859-15
iso8859-2/Compose: ro_RO.ISO8859-2
-+XCOMM microsoft-cp1251/Compose: ru_RU.CP1251
koi8-r/Compose: ru_RU.KOI8-R
--iso8859-5/Compose: ru_RU.ISO8859-5
--microsoft-cp1251/Compose: ru_RU.CP1251
-+XCOMM microsoft-cp1251/Compose: ru_UA.CP1251
+ iso8859-5/Compose: ru_RU.ISO8859-5
+ microsoft-cp1251/Compose: ru_RU.CP1251
++microsoft-cp1251/Compose: ru_UA.CP1251
koi8-u/Compose: ru_UA.KOI8-U
iso8859-1/Compose: rw_RW.ISO8859-1
iso8859-2/Compose: sh_YU.ISO8859-2
@@ -262,13 +243,7 @@ Index: libx11/nls/compose.dir.pre
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_YU.ISO8859-2
- iso8859-5/Compose: sr_YU.ISO8859-5
-+XCOMM microsoft-cp1251/Compose: sr_YU.CP1251
- iso8859-1/Compose: ss_ZA.ISO8859-1
- iso8859-1/Compose: st_ZA.ISO8859-1
- iso8859-1/Compose: sv_FI.ISO8859-1
-@@ -212,38 +256,59 @@
+@@ -212,38 +256,57 @@
iso8859-15/Compose: sv_SE.ISO8859-15
tscii-0/Compose: ta_IN.TSCII-0
koi8-c/Compose: tg_TJ.KOI8-C
@@ -284,17 +259,15 @@ Index: libx11/nls/compose.dir.pre
koi8-c/Compose: tt_RU.KOI8-C
+iso8859-5/Compose: uk_UA.ISO8859-5
koi8-u/Compose: uk_UA.KOI8-U
--microsoft-cp1256/Compose: ur_PK.CP1256
-+XCOMM microsoft-cp1251/Compose: uk_UA.CP1251
-+XCOMM microsoft-cp1256/Compose: ur_PK.CP1256
+ microsoft-cp1256/Compose: ur_PK.CP1256
+iso8859-1/Compose: uz_UZ.ISO8859-1
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
-+XCOMM microsoft-cp1255/Compose: yi_US.CP1255
- microsoft-cp1255/Compose: yi_US.CP1256
+-microsoft-cp1255/Compose: yi_US.CP1256
++microsoft-cp1255/Compose: yi_US.CP1255
zh_CN/Compose: zh_CN.eucCN
-zh_CN/Compose: zh_CN.GB2312
-zh_CN.gbk/Compose: zh_CN.GBK
@@ -334,7 +307,7 @@ Index: libx11/nls/compose.dir.pre
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,15 +318,18 @@
+@@ -253,15 +316,18 @@
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
@@ -354,7 +327,7 @@ Index: libx11/nls/compose.dir.pre
en_US.UTF-8/Compose: ca_AD.UTF-8
en_US.UTF-8/Compose: ca_ES.UTF-8
en_US.UTF-8/Compose: ca_FR.UTF-8
-@@ -279,18 +347,29 @@
+@@ -279,18 +345,29 @@
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
@@ -385,7 +358,7 @@ Index: libx11/nls/compose.dir.pre
en_US.UTF-8/Compose: es_AR.UTF-8
en_US.UTF-8/Compose: es_BO.UTF-8
en_US.UTF-8/Compose: es_CL.UTF-8
-@@ -313,6 +392,7 @@
+@@ -313,6 +390,7 @@
en_US.UTF-8/Compose: es_VE.UTF-8
en_US.UTF-8/Compose: et_EE.UTF-8
en_US.UTF-8/Compose: eu_ES.UTF-8
@@ -393,7 +366,7 @@ Index: libx11/nls/compose.dir.pre
en_US.UTF-8/Compose: fa_IR.UTF-8
fi_FI.UTF-8/Compose: fi_FI.UTF-8
en_US.UTF-8/Compose: fo_FO.UTF-8
-@@ -323,6 +403,8 @@
+@@ -323,6 +401,8 @@
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
@@ -402,7 +375,7 @@ Index: libx11/nls/compose.dir.pre
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
-@@ -336,10 +418,13 @@
+@@ -336,10 +416,13 @@
en_US.UTF-8/Compose: it_CH.UTF-8
en_US.UTF-8/Compose: it_IT.UTF-8
en_US.UTF-8/Compose: iu_CA.UTF-8
@@ -416,7 +389,7 @@ Index: libx11/nls/compose.dir.pre
en_US.UTF-8/Compose: ko_KR.UTF-8
en_US.UTF-8/Compose: kw_GB.UTF-8
en_US.UTF-8/Compose: ky_KG.UTF-8
-@@ -348,8 +433,12 @@
+@@ -348,8 +431,12 @@
en_US.UTF-8/Compose: lv_LV.UTF-8
en_US.UTF-8/Compose: mi_NZ.UTF-8
en_US.UTF-8/Compose: mk_MK.UTF-8
@@ -429,7 +402,7 @@ Index: libx11/nls/compose.dir.pre
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
-@@ -357,11 +446,17 @@
+@@ -357,11 +444,17 @@
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
@@ -450,7 +423,7 @@ Index: libx11/nls/compose.dir.pre
en_US.UTF-8/Compose: ph_PH.UTF-8
en_US.UTF-8/Compose: pl_PL.UTF-8
en_US.UTF-8/Compose: pp_AN.UTF-8
-@@ -371,10 +466,14 @@
+@@ -371,10 +464,14 @@
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
@@ -465,7 +438,7 @@ Index: libx11/nls/compose.dir.pre
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
-@@ -385,8 +484,12 @@
+@@ -385,8 +482,12 @@
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
commit c856251fff089b8749b7848e676a52e55e3def76
Author: Julien Cristau <jcris...@debian.org>
Date: Wed Apr 8 11:49:12 2009 +0100
mention bugs fixed upstream
diff --git a/debian/changelog b/debian/changelog
index 943f2d2..e14e558 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,11 @@
libx11 (2:1.2.1-1) UNRELEASED; urgency=low
* New upstream release.
+ + fixes fi_FI.UTF-8 locale (closes: #519474)
+ + adds sr_RS locale (closes: #507940)
+ + adds hu_HU.utf8 locale alias (closes: #407573)
+ + Compose entries for some standard mathematical operators
+ (closes: #411734)
* Patch 012_ru_RU_UTF-8_XLC_LOCALE.diff removed, applied upstream.
* Update patches 003_recognize_glibc_2.3.2_locale_names.diff,
006_tailor_pt_BR.UTF-8_Compose.diff and 015_russian_locale_alias.diff.
commit 005ca35db8b8ce23b8e764644a753014e8353663
Author: Julien Cristau <jcris...@debian.org>
Date: Wed Apr 8 03:26:01 2009 +0200
Update patch stack
diff --git a/debian/changelog b/debian/changelog
index 024a783..943f2d2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ libx11 (2:1.2.1-1) UNRELEASED; urgency=low
* New upstream release.
* Patch 012_ru_RU_UTF-8_XLC_LOCALE.diff removed, applied upstream.
+ * Update patches 003_recognize_glibc_2.3.2_locale_names.diff,
+ 006_tailor_pt_BR.UTF-8_Compose.diff and 015_russian_locale_alias.diff.
-- Julien Cristau <jcris...@debian.org> Wed, 08 Apr 2009 02:37:36 +0200
diff --git a/debian/patches/003_recognize_glibc_2.3.2_locale_names.diff
b/debian/patches/003_recognize_glibc_2.3.2_locale_names.diff
index ee146f7..59af1f6 100644
--- a/debian/patches/003_recognize_glibc_2.3.2_locale_names.diff
+++ b/debian/patches/003_recognize_glibc_2.3.2_locale_names.diff
@@ -223,7 +223,7 @@ Index: libx11/nls/compose.dir.pre
iso8859-1/Compose: ms_MY.ISO8859-1
iso8859-3/Compose: mt_MT.ISO8859-3
iso8859-1/Compose: nl_BE.ISO8859-1
-@@ -180,25 +216,32 @@
+@@ -180,30 +216,38 @@
iso8859-15/Compose: ny_NO.ISO8859-15
iso8859-1/Compose: oc_FR.ISO8859-1
iso8859-15/Compose: oc_FR.ISO8859-15
@@ -259,18 +259,16 @@ Index: libx11/nls/compose.dir.pre
+iso8859-1/Compose: so_DJ.ISO8859-1
+iso8859-1/Compose: so_KE.ISO8859-1
+iso8859-1/Compose: so_SO.ISO8859-1
- iso8859-5/Compose: sp_YU.ISO8859-5
iso8859-2/Compose: sq_AL.ISO8859-2
iso8859-2/Compose: sr_CS.ISO8859-2
-@@ -206,6 +249,7 @@
- iso8859-2/Compose: sr_SP.ISO8859-2
+ iso8859-5/Compose: sr_CS.ISO8859-5
iso8859-2/Compose: sr_YU.ISO8859-2
iso8859-5/Compose: sr_YU.ISO8859-5
+XCOMM microsoft-cp1251/Compose: sr_YU.CP1251
iso8859-1/Compose: ss_ZA.ISO8859-1
iso8859-1/Compose: st_ZA.ISO8859-1
iso8859-1/Compose: sv_FI.ISO8859-1
-@@ -214,38 +258,59 @@
+@@ -212,38 +256,59 @@
iso8859-15/Compose: sv_SE.ISO8859-15
tscii-0/Compose: ta_IN.TSCII-0
koi8-c/Compose: tg_TJ.KOI8-C
@@ -336,7 +334,7 @@ Index: libx11/nls/compose.dir.pre
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,15 +320,18 @@
+@@ -253,15 +318,18 @@
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
@@ -356,8 +354,8 @@ Index: libx11/nls/compose.dir.pre
en_US.UTF-8/Compose: ca_AD.UTF-8
en_US.UTF-8/Compose: ca_ES.UTF-8
en_US.UTF-8/Compose: ca_FR.UTF-8
-@@ -280,17 +348,28 @@
- en_US.UTF-8/Compose: de_LU.UTF-8
+@@ -279,18 +347,29 @@
+ 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
@@ -370,6 +368,7 @@ Index: libx11/nls/compose.dir.pre
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
@@ -386,12 +385,7 @@ Index: libx11/nls/compose.dir.pre
en_US.UTF-8/Compose: es_AR.UTF-8
en_US.UTF-8/Compose: es_BO.UTF-8
en_US.UTF-8/Compose: es_CL.UTF-8
-@@ -308,10 +387,12 @@
- en_US.UTF-8/Compose: es_PR.UTF-8
- en_US.UTF-8/Compose: es_PY.UTF-8
- en_US.UTF-8/Compose: es_SV.UTF-8
-+en_US.UTF-8/Compose: es_US.UTF-8
- en_US.UTF-8/Compose: es_UY.UTF-8
+@@ -313,6 +392,7 @@
en_US.UTF-8/Compose: es_VE.UTF-8
en_US.UTF-8/Compose: et_EE.UTF-8
en_US.UTF-8/Compose: eu_ES.UTF-8
@@ -399,7 +393,7 @@ Index: libx11/nls/compose.dir.pre
en_US.UTF-8/Compose: fa_IR.UTF-8
fi_FI.UTF-8/Compose: fi_FI.UTF-8
en_US.UTF-8/Compose: fo_FO.UTF-8
-@@ -322,6 +403,8 @@
+@@ -323,6 +403,8 @@
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
@@ -408,7 +402,7 @@ Index: libx11/nls/compose.dir.pre
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
-@@ -335,9 +418,12 @@
+@@ -336,10 +418,13 @@
en_US.UTF-8/Compose: it_CH.UTF-8
en_US.UTF-8/Compose: it_IT.UTF-8
en_US.UTF-8/Compose: iu_CA.UTF-8
@@ -416,12 +410,13 @@ Index: libx11/nls/compose.dir.pre
en_US.UTF-8/Compose: ja_JP.UTF-8
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: km_KH.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
en_US.UTF-8/Compose: ky_KG.UTF-8
-@@ -346,18 +432,30 @@
+@@ -348,8 +433,12 @@
en_US.UTF-8/Compose: lv_LV.UTF-8
en_US.UTF-8/Compose: mi_NZ.UTF-8
en_US.UTF-8/Compose: mk_MK.UTF-8
@@ -429,16 +424,16 @@ Index: libx11/nls/compose.dir.pre
+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: mt_MT.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: no_NO.UTF-8
+ en_US.UTF-8/Compose: nn_NO.UTF-8
+@@ -357,11 +446,17 @@
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: nn_NO.UTF-8
+XCOMM ny is the language code for Nyanja (spoken in Malawi), not Nynorsk.
+XCOMM See <URL: http://www.ethnologue.com/show_iso639.asp?code=nya >.
+XCOMM en_US.UTF-8/Compose: ny_NO.UTF-8
@@ -455,11 +450,12 @@ Index: libx11/nls/compose.dir.pre
en_US.UTF-8/Compose: ph_PH.UTF-8
en_US.UTF-8/Compose: pl_PL.UTF-8
en_US.UTF-8/Compose: pp_AN.UTF-8
-@@ -367,9 +465,13 @@
+@@ -371,10 +466,14 @@
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
+en_US.UTF-8/Compose: se_NO.UTF-8
+ en_US.UTF-8/Compose: sh_BA.UTF-8
+en_US.UTF-8/Compose: sh_YU.UTF-8
+en_US.UTF-8/Compose: sid_ET.UTF-8
en_US.UTF-8/Compose: si_LK.UTF-8
@@ -468,8 +464,8 @@ Index: libx11/nls/compose.dir.pre
+en_US.UTF-8/Compose: so_ET.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_YU.UTF-8
-@@ -378,8 +480,12 @@
+ en_US.UTF-8/Compose: sr_ME.UTF-8
+@@ -385,8 +484,12 @@
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
@@ -486,7 +482,7 @@ Index: libx11/nls/locale.alias.pre
===================================================================
--- libx11.orig/nls/locale.alias.pre
+++ libx11/nls/locale.alias.pre
-@@ -301,6 +301,12 @@
+@@ -306,6 +306,12 @@
en_CA.ISO-8859-1: en_CA.ISO8859-1
en_CA.ISO_8859-1: en_CA.ISO8859-1
en_CA.utf8: en_CA.UTF-8
@@ -499,7 +495,7 @@ Index: libx11/nls/locale.alias.pre
en_GB: en_GB.ISO8859-1
en_GB.88591: en_GB.ISO8859-1
en_GB.88591.en: en_GB.ISO8859-1
-@@ -354,6 +360,7 @@
+@@ -359,6 +365,7 @@
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
@@ -507,7 +503,7 @@ Index: libx11/nls/locale.alias.pre
en_US.8859-15: en_US.ISO8859-15
en_us.iso8859...@euro: en_US.ISO8859-15
en_US.utf8: en_US.UTF-8
-@@ -720,6 +727,10 @@
+@@ -733,6 +740,10 @@
kl_GL.ISO-8859-1: kl_GL.ISO8859-1
kl_GL.iso885915: kl_GL.ISO8859-15
kl_GL.utf8: kl_GL.UTF-8
@@ -518,7 +514,7 @@ Index: libx11/nls/locale.alias.pre
kn: kn_IN.UTF-8
kn_IN.utf8: kn_IN.UTF-8
kn_IN.UTF-8: kn_IN.UTF-8
-@@ -897,7 +908,6 @@
+@@ -916,7 +927,6 @@
pt_BR.iso88591: pt_BR.ISO8859-1
pt_BR.ISO-8859-1: pt_BR.ISO8859-1
pt_BR.ISO_8859-1: pt_BR.ISO8859-1
@@ -526,21 +522,20 @@ Index: libx11/nls/locale.alias.pre
pt_BR.utf8: pt_BR.UTF-8
pt_PT: pt_PT.ISO8859-1
pt_PT.88591: pt_PT.ISO8859-1
-@@ -949,12 +959,12 @@
- XCOMM YU was the old ISO code for Yugoslavia (now CS for Serbia&Montenegro).
+@@ -972,11 +982,11 @@
XCOMM These lines should be deleted in the future.
- sh: sr_CS.ISO8859-2
+ sh: sr_rs.ut...@latin
+ sh_ba.iso885...@bosnia: sr_CS.ISO8859-2
-sh_HR.iso88592: hr_HR.ISO8859-2
- sh_SP: sr_CS.ISO8859-2
- sh_YU: sr_CS.ISO8859-2
- sh_YU.utf8: sr_CS.UTF-8
+ sh_YU: sr_rs.ut...@latin
+ sh_YU.utf8: sr_rs.ut...@latin
si: si_LK.UTF-8
si_LK: si_LK.UTF-8
+sid_ET: sid_ET.UTF-8
sk: sk_SK.ISO8859-2
sk_SK: sk_SK.ISO8859-2
sk_SK.iso88592: sk_SK.ISO8859-2
-@@ -1176,7 +1186,7 @@
+@@ -1185,7 +1195,7 @@
american.iso88591: en_US.ISO8859-1
arabic.iso88596: ar_AA.ISO8859-6
bokmal: nb_NO.ISO8859-1
@@ -549,7 +544,7 @@ Index: libx11/nls/locale.alias.pre
bulgarian: bg_BG.CP1251
c-french.iso88591: fr_CA.ISO8859-1
catalan: ca_ES.ISO8859-1
-@@ -1191,11 +1201,11 @@
+@@ -1200,11 +1210,11 @@
dutch: nl_NL.ISO8859-1
dutch.iso88591: nl_BE.ISO8859-1
eesti: et_EE.ISO8859-1
@@ -563,7 +558,7 @@ Index: libx11/nls/locale.alias.pre
french: fr_FR.ISO8859-1
french.iso88591: fr_CH.ISO8859-1
galego: gl_ES.ISO8859-1
-@@ -1204,8 +1214,8 @@
+@@ -1213,8 +1223,8 @@
german.iso88591: de_CH.ISO8859-1
greek: el_GR.ISO8859-7
greek.iso88597: el_GR.ISO8859-7
@@ -694,10 +689,10 @@ Index: libx11/nls/locale.dir.pre
+iso8859-1/XLC_LOCALE: so_DJ.ISO8859-1
+iso8859-1/XLC_LOCALE: so_KE.ISO8859-1
+iso8859-1/XLC_LOCALE: so_SO.ISO8859-1
- iso8859-5/XLC_LOCALE: sp_YU.ISO8859-5
iso8859-2/XLC_LOCALE: sq_AL.ISO8859-2
iso8859-2/XLC_LOCALE: sr_CS.ISO8859-2
-@@ -224,8 +248,8 @@
+ iso8859-5/XLC_LOCALE: sr_CS.ISO8859-5
+@@ -222,8 +246,8 @@
iso8859-15/XLC_LOCALE: sv_SE.ISO8859-15
tscii-0/XLC_LOCALE: ta_IN.TSCII-0
koi8-c/XLC_LOCALE: tg_TJ.KOI8-C
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
