Author: ender
Date: 2006-01-11 07:26:45 -0500 (Wed, 11 Jan 2006)
New Revision: 1064
Modified:
trunk/debian/changelog
trunk/debian/patches/general/011a_recognize_glibc_2.3.2_locale_names.diff
Log:
Fixed Compose key for LC_CTYPE=cs_CZ.UTF-8 (closes: #347531).
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2006-01-11 10:46:20 UTC (rev 1063)
+++ trunk/debian/changelog 2006-01-11 12:26:45 UTC (rev 1064)
@@ -12,12 +12,13 @@
* Updated Turkish translation. Thanks, Recai Oktaş and Osman Yüksel
(closes: #347494).
* Updated Japanese translation. Thanks, Kenshi Muto (closes: #347498).
+ * Fixed Compose key for LC_CTYPE=cs_CZ.UTF-8 (closes: #347531).
[ David Nusinow ]
* MANIFEST updates for mips and mipsel over evdev manpage that was added for
last upload
- -- David Martínez Moreno <[EMAIL PROTECTED]> Wed, 11 Jan 2006 11:45:10 +0100
+ -- David Martínez Moreno <[EMAIL PROTECTED]> Wed, 11 Jan 2006 13:06:52 +0100
xorg-x11 (6.9.0.dfsg.1-3) unstable; urgency=low
Modified:
trunk/debian/patches/general/011a_recognize_glibc_2.3.2_locale_names.diff
===================================================================
--- trunk/debian/patches/general/011a_recognize_glibc_2.3.2_locale_names.diff
2006-01-11 10:46:20 UTC (rev 1063)
+++ trunk/debian/patches/general/011a_recognize_glibc_2.3.2_locale_names.diff
2006-01-11 12:26:45 UTC (rev 1064)
@@ -57,8 +57,8 @@
Index: xc/nls/compose.dir
===================================================================
---- xc/nls/compose.dir.orig 2005-10-18 19:43:56.000000000 -0400
-+++ xc/nls/compose.dir 2005-10-18 20:33:44.000000000 -0400
+--- xc/nls/compose.dir.orig 2005-12-27 13:34:54.287185679 +0100
++++ xc/nls/compose.dir 2006-01-11 13:05:58.899883007 +0100
@@ -1,14 +1,22 @@
XCOMM $Xorg: compose.dir,v 1.3 2000/08/17 19:46:48 cpqbld Exp $
XCOMM
@@ -319,7 +319,7 @@
+XCOMM a3 is not an ISO 639 language code, but in Cyrillic, "Z" looks like "3".
+en_US.UTF-8/Compose: a3_AZ.UTF-8
+en_US.UTF-8/Compose: aa_ER.UTF-8
-+en_US.UTF-8/Compose: aa_ET.UTF-8
++en_US.UTF-8/Compose: aa_ET.UTF-8
en_US.UTF-8/Compose: af_ZA.UTF-8
+en_US.UTF-8/Compose: am_ET.UTF-8
en_US.UTF-8/Compose: ar_AA.UTF-8
@@ -331,7 +331,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
-@@ -247,17 +309,19 @@
+@@ -247,15 +309,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
@@ -349,11 +349,9 @@
en_US.UTF-8/Compose: br_FR.UTF-8
+en_US.UTF-8/Compose: byn_ER.UTF-8
en_US.UTF-8/Compose: ca_ES.UTF-8
--en_US.UTF-8/Compose: cs_CZ.UTF-8
+ en_US.UTF-8/Compose: cs_CZ.UTF-8
en_US.UTF-8/Compose: cy_GB.UTF-8
- en_US.UTF-8/Compose: cz_CZ.UTF-8
- en_US.UTF-8/Compose: da_DK.UTF-8
-@@ -269,17 +333,28 @@
+@@ -269,17 +334,28 @@
en_US.UTF-8/Compose: de_LU.UTF-8
el_GR.UTF-8/Compose: el_GR.UTF-8
en_US.UTF-8/Compose: en_AU.UTF-8
@@ -383,7 +381,7 @@
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
-@@ -297,10 +372,12 @@
+@@ -297,10 +373,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
@@ -396,7 +394,7 @@
en_US.UTF-8/Compose: fa_IR.UTF-8
en_US.UTF-8/Compose: fi_FI.UTF-8
en_US.UTF-8/Compose: fo_FO.UTF-8
-@@ -311,6 +388,8 @@
+@@ -311,6 +389,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
@@ -405,7 +403,7 @@
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
-@@ -324,9 +403,11 @@
+@@ -324,9 +404,11 @@
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
@@ -417,7 +415,7 @@
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
-@@ -335,18 +416,30 @@
+@@ -335,18 +417,30 @@
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
@@ -451,7 +449,7 @@
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
-@@ -356,9 +449,13 @@
+@@ -356,9 +450,13 @@
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 +463,7 @@
en_US.UTF-8/Compose: sq_AL.UTF-8
en_US.UTF-8/Compose: sr_YU.UTF-8
en_US.UTF-8/Compose: ss_ZA.UTF-8
-@@ -366,8 +463,12 @@
+@@ -366,8 +464,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
@@ -480,8 +478,8 @@
en_US.UTF-8/Compose: tr_TR.UTF-8
Index: xc/nls/locale.alias
===================================================================
---- xc/nls/locale.alias.orig 2005-10-18 19:43:56.000000000 -0400
-+++ xc/nls/locale.alias 2005-10-18 20:19:59.000000000 -0400
+--- xc/nls/locale.alias.orig 2005-12-27 13:34:54.291185961 +0100
++++ xc/nls/locale.alias 2006-01-11 13:02:57.579483361 +0100
@@ -323,6 +323,7 @@
en_US.ISO-8859-1: en_US.ISO8859-1
en_US.ISO_8859-1: en_US.ISO8859-1
@@ -734,8 +732,8 @@
ISO8859-1: en_US.ISO8859-1
Index: xc/nls/locale.dir
===================================================================
---- xc/nls/locale.dir.orig 2005-10-18 19:43:56.000000000 -0400
-+++ xc/nls/locale.dir 2005-10-18 20:50:28.000000000 -0400
+--- xc/nls/locale.dir.orig 2005-12-27 13:34:54.291185961 +0100
++++ xc/nls/locale.dir 2006-01-11 13:02:57.583483635 +0100
@@ -9,8 +9,13 @@
XCOMM
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
