Author: barbier
Date: 2006-07-06 17:53:13 -0400 (Thu, 06 Jul 2006)
New Revision: 2466
Added:
branches/7.1/lib/libx11/debian/patches/014_add_Khmer_digraphs.diff
Modified:
branches/7.1/lib/libx11/debian/changelog
branches/7.1/lib/libx11/debian/patches/003_recognize_glibc_2.3.2_locale_names.diff
branches/7.1/lib/libx11/debian/patches/series
Log:
Merge r2465 from trunk:
* Add 014_add_Khmer_digraphs.diff. Khmer keyboards have to generate
several characters with a single keystroke, so define them in
en_US.UTF-8/Compose. They will be added later to all UTF-8 files.
Thanks Paul Wise. (closes: #355957)
* Add support for Khmer locale in 003_recognize_glibc_2.3.2_locale_names.diff
Modified: branches/7.1/lib/libx11/debian/changelog
===================================================================
--- branches/7.1/lib/libx11/debian/changelog 2006-07-06 21:36:53 UTC (rev
2465)
+++ branches/7.1/lib/libx11/debian/changelog 2006-07-06 21:53:13 UTC (rev
2466)
@@ -9,8 +9,10 @@
[ Denis Barbier ]
* Sync patches:
+ - 003_recognize_glibc_2.3.2_locale_names.diff
- 005_Compose_fix_latin1_UTF8.diff
- 006_tailor_pt_BR.UTF-8_Compose.diff
+ - 014_add_Khmer_digraphs.diff
-- David Nusinow <[EMAIL PROTECTED]> Tue, 4 Jul 2006 13:25:43 -0400
Modified:
branches/7.1/lib/libx11/debian/patches/003_recognize_glibc_2.3.2_locale_names.diff
===================================================================
---
branches/7.1/lib/libx11/debian/patches/003_recognize_glibc_2.3.2_locale_names.diff
2006-07-06 21:36:53 UTC (rev 2465)
+++
branches/7.1/lib/libx11/debian/patches/003_recognize_glibc_2.3.2_locale_names.diff
2006-07-06 21:53:13 UTC (rev 2466)
@@ -57,8 +57,8 @@
Index: libx11/nls/compose.dir.pre
===================================================================
---- libx11.orig/nls/compose.dir.pre 2006-07-03 14:10:48.000000000 -0400
-+++ libx11/nls/compose.dir.pre 2006-07-03 14:30:06.000000000 -0400
+--- libx11.orig/nls/compose.dir.pre
++++ libx11/nls/compose.dir.pre
@@ -1,14 +1,22 @@
XCOMM $Xorg: compose.dir,v 1.3 2000/08/17 19:46:48 cpqbld Exp $
XCOMM
@@ -407,7 +407,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
-@@ -326,9 +408,11 @@
+@@ -326,9 +408,12 @@
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
@@ -415,11 +415,12 @@
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: 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
-@@ -337,18 +421,30 @@
+@@ -337,18 +422,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
@@ -453,7 +454,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
-@@ -358,9 +454,13 @@
+@@ -358,9 +455,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
@@ -467,7 +468,7 @@
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
-@@ -369,8 +469,12 @@
+@@ -369,8 +470,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
@@ -482,8 +483,8 @@
en_US.UTF-8/Compose: tr_TR.UTF-8
Index: libx11/nls/locale.alias.pre
===================================================================
---- libx11.orig/nls/locale.alias.pre 2006-07-03 14:10:39.000000000 -0400
-+++ libx11/nls/locale.alias.pre 2006-07-03 14:37:20.000000000 -0400
+--- libx11.orig/nls/locale.alias.pre
++++ libx11/nls/locale.alias.pre
@@ -324,6 +324,7 @@
en_US.ISO-8859-1: en_US.ISO8859-1
en_US.ISO_8859-1: en_US.ISO8859-1
@@ -492,7 +493,18 @@
en_US.8859-15: en_US.ISO8859-15
[EMAIL PROTECTED]: en_US.ISO8859-15
en_US.utf8: en_US.UTF-8
-@@ -858,7 +859,6 @@
+@@ -690,6 +691,10 @@
+ kl_GL.ISO-8859-1: kl_GL.ISO8859-1
+ kl_GL.iso885915: kl_GL.ISO8859-15
+ kl_GL.utf8: kl_GL.UTF-8
++km: km_KH.UTF-8
++km_KH: km_KH.UTF-8
++km_KH.utf8: km_KH.UTF-8
++km_KH.UTF-8: km_KH.UTF-8
+ ko: ko_KR.eucKR
+ ko_KR: ko_KR.eucKR
+ KO_KR: ko_KR.eucKR
+@@ -858,7 +863,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
@@ -500,7 +512,7 @@
pt_BR.utf8: pt_BR.UTF-8
pt_PT: pt_PT.ISO8859-1
pt_PT.88591: pt_PT.ISO8859-1
-@@ -909,12 +909,12 @@
+@@ -909,12 +913,12 @@
XCOMM YU was the old ISO code for Yugoslavia (now CS for Serbia&Montenegro).
XCOMM These lines should be deleted in the future.
sh: sr_CS.ISO8859-2
@@ -514,7 +526,7 @@
sk: sk_SK.ISO8859-2
sk_SK: sk_SK.ISO8859-2
sk_SK.iso88592: sk_SK.ISO8859-2
-@@ -1145,7 +1145,7 @@
+@@ -1145,7 +1149,7 @@
dutch: nl_NL.ISO8859-1
dutch.iso88591: nl_BE.ISO8859-1
eesti: et_EE.ISO8859-1
@@ -523,7 +535,7 @@
estonian: et_EE.ISO8859-1
finnish: fi_FI.ISO8859-1
finnish.iso88591: fi_FI.ISO8859-1
-@@ -1158,8 +1158,8 @@
+@@ -1158,8 +1162,8 @@
german.iso88591: de_CH.ISO8859-1
greek: el_GR.ISO8859-7
greek.iso88597: el_GR.ISO8859-7
@@ -534,7 +546,7 @@
hrvatski: hr_HR.ISO8859-2
hungarian: hu_HU.ISO8859-2
icelandic.iso88591: is_IS.ISO8859-1
-@@ -1202,103 +1202,103 @@
+@@ -1202,103 +1206,103 @@
#ifdef WIN32
XCOMM Microsoft Windows/NT 4.0 SP3
XCOMM parser doesn't grok embedded spaces in locale name
@@ -737,8 +749,8 @@
ISO8859-1: en_US.ISO8859-1
Index: libx11/nls/locale.dir.pre
===================================================================
---- libx11.orig/nls/locale.dir.pre 2006-07-03 14:10:29.000000000 -0400
-+++ libx11/nls/locale.dir.pre 2006-07-03 14:38:58.000000000 -0400
+--- libx11.orig/nls/locale.dir.pre
++++ libx11/nls/locale.dir.pre
@@ -9,8 +9,13 @@
XCOMM
@@ -966,7 +978,7 @@
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
-@@ -347,9 +392,11 @@
+@@ -347,9 +392,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
@@ -974,11 +986,12 @@
ja_JP.UTF-8/XLC_LOCALE: ja_JP.UTF-8
en_US.UTF-8/XLC_LOCALE: ka_GE.UTF-8
en_US.UTF-8/XLC_LOCALE: kl_GL.UTF-8
++en_US.UTF-8/XLC_LOCALE: km_KH.UTF-8
+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
en_US.UTF-8/XLC_LOCALE: ky_KG.UTF-8
-@@ -358,20 +405,30 @@
+@@ -358,20 +406,30 @@
en_US.UTF-8/XLC_LOCALE: lv_LV.UTF-8
en_US.UTF-8/XLC_LOCALE: mi_NZ.UTF-8
en_US.UTF-8/XLC_LOCALE: mk_MK.UTF-8
@@ -1012,7 +1025,7 @@
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
-@@ -382,10 +439,12 @@
+@@ -382,10 +440,12 @@
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
@@ -1025,7 +1038,7 @@
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_YU.UTF-8
-@@ -394,10 +453,12 @@
+@@ -394,10 +454,12 @@
en_US.UTF-8/XLC_LOCALE: sv_FI.UTF-8
en_US.UTF-8/XLC_LOCALE: sv_SE.UTF-8
en_US.UTF-8/XLC_LOCALE: ta_IN.UTF-8
Added: branches/7.1/lib/libx11/debian/patches/014_add_Khmer_digraphs.diff
===================================================================
--- branches/7.1/lib/libx11/debian/patches/014_add_Khmer_digraphs.diff
2006-07-06 21:36:53 UTC (rev 2465)
+++ branches/7.1/lib/libx11/debian/patches/014_add_Khmer_digraphs.diff
2006-07-06 21:53:13 UTC (rev 2466)
@@ -0,0 +1,18 @@
+Index: libx11/nls/en_US.UTF-8/Compose.pre
+===================================================================
+--- libx11.orig/nls/en_US.UTF-8/Compose.pre
++++ libx11/nls/en_US.UTF-8/Compose.pre
+@@ -5598,3 +5598,13 @@
+ <Multi_key> <U1d1b9> <U1d165> <U1d16f> : "𝆹𝅥𝅯" U1D1BF # MUSICAL SYMBOL
FUSA WHITE
+ <Multi_key> <U1d1bc> <U1d16f> : "𝆺𝅥𝅯" U1D1C0 # MUSICAL SYMBOL FUSA BLACK
+ <Multi_key> <U1d1ba> <U1d165> <U1d16f> : "𝆺𝅥𝅯" U1D1C0 # MUSICAL SYMBOL
FUSA BLACK
++
++XCOMM Khmer digraphs
++XCOMM A keystroke has to generate several characters, so they are defined
++XCOMM in this file
++
++<U17fb> : "ុះ"
++<U17fc> : "ុំ"
++<U17fd> : "េះ"
++<U17fe> : "ោះ"
++<U17ff> : "ាំ"
Modified: branches/7.1/lib/libx11/debian/patches/series
===================================================================
--- branches/7.1/lib/libx11/debian/patches/series 2006-07-06 21:36:53 UTC
(rev 2465)
+++ branches/7.1/lib/libx11/debian/patches/series 2006-07-06 21:53:13 UTC
(rev 2466)
@@ -8,3 +8,4 @@
008_remove_ko_Compose.diff
009_iso8859-15_Compose_Eurosign.diff
012_ru_RU_UTF-8_XLC_LOCALE.diff
+014_add_Khmer_digraphs.diff
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
