libx11: Changes to 'debian-unstable'
ChangeLog | 1317 ++
configure.ac | 26
cpprules.in | 6
debian/changelog | 9
debian/patches/003_recognize_glibc_2.3.2_locale_names.diff | 100
debian/patches/006_tailor_pt_BR.UTF-8_Compose.diff | 4290 -------
debian/patches/series | 1
debian/upstream/signing-key.asc | 60
debian/watch | 1
include/X11/Xlib.h | 17
include/X11/Xlocale.h | 22
man/Compose.man | 16
man/XCreateGC.man | 94
man/XErrorEvent.man | 2
man/xkb/XkbGetKeyBehaviors.man | 6
man/xkb/XkbGetMap.man | 2
man/xkb/XkbLookupKeySym.man | 2
man/xkb/XkbSetIgnoreLockMods.man | 1
man/xkb/XkbSetServerInternalMods.man | 1
man/xkb/XkbTranslateKeyCode.man | 2
modules/im/ximcp/imCallbk.c | 10
modules/im/ximcp/imDefIc.c | 7
modules/im/ximcp/imDefIm.c | 6
modules/im/ximcp/imDefLkup.c | 13
modules/im/ximcp/imInt.c | 9
modules/im/ximcp/imLcIm.c | 102
modules/im/ximcp/imLcPrs.c | 5
modules/im/ximcp/imRmAttr.c | 24
modules/im/ximcp/imThaiIc.c | 18
modules/lc/Makefile.am | 2
modules/lc/def/lcDefConv.c | 41
modules/lc/gen/lcGenConv.c | 53
modules/lc/xlocale/Makefile.am | 35
modules/lc/xlocale/lcEuc.c | 1537 --
modules/lc/xlocale/lcJis.c | 944 -
modules/lc/xlocale/lcSjis.c | 1612 --
modules/om/generic/omGeneric.c | 45
nls/C/XLC_LOCALE.pre | 2
nls/Makefile.am | 6
nls/armscii-8/XLC_LOCALE.pre | 2
nls/compose.dir.pre | 23
nls/cs_CZ.UTF-8/Compose.pre | 12
nls/en_US.UTF-8/Compose.pre | 113
nls/fi_FI.UTF-8/Compose.pre | 710 -
nls/georgian-academy/XLC_LOCALE.pre | 2
nls/georgian-ps/XLC_LOCALE.pre | 2
nls/ibm-cp1133/XLC_LOCALE.pre | 2
nls/iscii-dev/XLC_LOCALE.pre | 2
nls/isiri-3342/XLC_LOCALE.pre | 2
nls/iso8859-1/XLC_LOCALE.pre | 2
nls/iso8859-10/XLC_LOCALE.pre | 2
nls/iso8859-11/XLC_LOCALE.pre | 2
nls/iso8859-13/XLC_LOCALE.pre | 2
nls/iso8859-14/XLC_LOCALE.pre | 2
nls/iso8859-15/XLC_LOCALE.pre | 2
nls/iso8859-2/XLC_LOCALE.pre | 2
nls/iso8859-3/XLC_LOCALE.pre | 2
nls/iso8859-4/XLC_LOCALE.pre | 2
nls/iso8859-5/XLC_LOCALE.pre | 2
nls/iso8859-6/XLC_LOCALE.pre | 2
nls/iso8859-7/XLC_LOCALE.pre | 2
nls/iso8859-8/XLC_LOCALE.pre | 2
nls/iso8859-9/XLC_LOCALE.pre | 2
nls/iso8859-9e/XLC_LOCALE.pre | 2
nls/ja.JIS/XLC_LOCALE.pre | 2
nls/ja.SJIS/XLC_LOCALE.pre | 2
nls/ja/XLC_LOCALE.pre | 2
nls/km_KH.UTF-8/Compose.pre | 2
nls/ko/XLC_LOCALE.pre | 2
nls/koi8-c/XLC_LOCALE.pre | 2
nls/koi8-r/XLC_LOCALE.pre | 2
nls/koi8-u/XLC_LOCALE.pre | 2
nls/locale.alias.pre | 4
nls/microsoft-cp1251/XLC_LOCALE.pre | 2
nls/microsoft-cp1255/XLC_LOCALE.pre | 2
nls/microsoft-cp1256/XLC_LOCALE.pre | 2
nls/mulelao-1/XLC_LOCALE.pre | 2
nls/nokhchi-1/XLC_LOCALE.pre | 2
nls/pt_BR.UTF-8/Compose.pre | 4307 -------
nls/sr_CS.UTF-8/Compose.pre | 32
nls/tatar-cyr/XLC_LOCALE.pre | 2
nls/th_TH/XLC_LOCALE.pre | 2
nls/tscii-0/XLC_LOCALE.pre | 2
nls/vi_VN.tcvn/XLC_LOCALE.pre | 2
nls/vi_VN.viscii/XLC_LOCALE.pre | 2
nls/zh_CN/XI18N_OBJS | 1
nls/zh_CN/XLC_LOCALE.pre | 2
nls/zh_TW.big5/XLC_LOCALE.pre | 2
nls/zh_TW/XLC_LOCALE.pre | 2
specs/XKB/acknowledgement.xml | 9
specs/XKB/ch01.xml | 111
specs/XKB/ch02.xml | 1046 -
specs/XKB/ch03.xml | 126
specs/XKB/ch04.xml | 890 -
specs/XKB/ch05.xml | 1191 +-
specs/XKB/ch06.xml | 464
specs/XKB/ch07.xml | 533
specs/XKB/ch08.xml | 2920 ++---
specs/XKB/ch09.xml | 1430 +-
specs/XKB/ch10.xml | 7425 ++++++-------
specs/XKB/ch11.xml | 586 -
specs/XKB/ch12.xml | 1358 +-
specs/XKB/ch13.xml | 6770 ++++++-----
specs/XKB/ch14.xml | 2205 +--
specs/XKB/ch15.xml | 4120 +++----
specs/XKB/ch16.xml | 6441 +++++------
specs/XKB/ch17.xml | 2350 ++--
specs/XKB/ch18.xml | 1551 +-
specs/XKB/ch19.xml | 351
specs/XKB/ch20.xml | 1212 +-
specs/XKB/ch21.xml | 3076 ++---
specs/XKB/ch22.xml | 323
specs/XKB/glossary.xml | 331
specs/XKB/xkblib.xml | 1
specs/i18n/framework/framework.xml | 2
specs/libX11/AppC.xml | 6
specs/libX11/AppD.xml | 5
specs/libX11/CH01.xml | 2
specs/libX11/CH03.xml | 46
specs/libX11/CH04.xml | 11
specs/libX11/CH05.xml | 17
specs/libX11/CH06.xml | 34
specs/libX11/CH07.xml | 38
specs/libX11/CH08.xml | 77
specs/libX11/CH09.xml | 3
specs/libX11/CH12.xml | 23
specs/libX11/CH13.xml | 18
specs/libX11/CH14.xml | 4
specs/libX11/CH16.xml | 47
src/FetchName.c | 4
src/Font.c | 22
src/FontInfo.c | 4
src/FontNames.c | 4
src/GetFPath.c | 4
src/GetHints.c | 18
src/GetNrmHint.c | 2
src/GetRGBCMap.c | 8
src/GetStCmap.c | 2
src/GetWMCMapW.c | 2
src/GetWMProto.c | 2
src/Iconify.c | 26
src/ImUtil.c | 4
src/InitExt.c | 2
src/KeyBind.c | 81
src/ListExt.c | 4
src/Macros.c | 14
src/Makefile.am | 2
src/ModMap.c | 5
src/OpenDis.c | 34
src/PutImage.c | 11
src/RdBitF.c | 2
src/ReconfWM.c | 37
src/ScrResStr.c | 3
src/SetLocale.c | 51
src/StBytes.c | 2
src/Withdraw.c | 22
src/XErrorDB | 12
src/XlibInt.c | 45
src/Xrm.c | 4
src/Xxcbint.h | 3
src/xcb_io.c | 11
src/xcms/cmsColNm.c | 2
src/xkb/XKB.c | 14
src/xkb/XKBAlloc.c | 3
src/xkb/XKBBind.c | 102
src/xkb/XKBExtDev.c | 6
src/xkb/XKBGAlloc.c | 6
src/xkb/XKBGeom.c | 13
src/xkb/XKBMAlloc.c | 94
src/xkb/XKBNames.c | 13
src/xkb/XKBRdBuf.c | 4
src/xlibi18n/ICWrap.c | 10
src/xlibi18n/Makefile.am | 3
src/xlibi18n/XDefaultOMIF.c | 36
src/xlibi18n/XlcPubI.h | 7
src/xlibi18n/Xlcint.h | 15
src/xlibi18n/lcFile.c | 19
src/xlibi18n/lcGeneric.c | 10
src/xlibi18n/lcInit.c | 29
src/xlibi18n/lcPrTxt.c | 3
src/xlibi18n/lcPublic.c | 20
src/xlibi18n/lcStd.c | 10
src/xlibi18n/lcUTF8.c | 4
src/xlibi18n/lcWrap.c | 3
184 files changed, 26260 insertions(+), 37498 deletions(-)
New commits:
commit 2e9f2dbe22d1124416a879197ed9f2d1b34a91d9
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Apr 30 22:31:20 2015 +0200
Upload to unstable
diff --git a/debian/changelog b/debian/changelog
index e7d4f76..d50db10 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-libx11 (2:1.6.3-1) UNRELEASED; urgency=medium
+libx11 (2:1.6.3-1) unstable; urgency=medium
- * Let uscan verify tarball signatures.
* New upstream release.
* Drop 006_tailor_pt_BR.UTF-8_Compose.diff, no longer necessary.
* Rediff 003_recognize_glibc_2.3.2_locale_names.diff.
+ * Let uscan verify tarball signatures.
- -- Julien Cristau <jcristau@debian.org> Thu, 30 Apr 2015 20:20:21 +0200
+ -- Julien Cristau <jcristau@debian.org> Thu, 30 Apr 2015 22:31:01 +0200
libx11 (2:1.6.2-3) unstable; urgency=medium
commit 481810e2aaa6b32401593e6d9abf2bf09d788c37
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Apr 30 20:40:01 2015 +0200
Mark _XNextRequest as hidden
diff --git a/src/Xxcbint.h b/src/Xxcbint.h
index bf41c23..64298d0 100644
--- a/src/Xxcbint.h
+++ b/src/Xxcbint.h
@@ -46,6 +46,7 @@ typedef struct _X11XCBPrivate {
int _XConnectXCB(Display *dpy, _Xconst char *display, int *screenp);
void _XFreeX11XCBStructure(Display *dpy);
+_X_HIDDEN
unsigned long _XNextRequest(Display *dpy);
#endif /* XXCBINT_H */
commit aba72cf91af2701c311c71fa72d6479e7fb71e16
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Apr 30 20:31:53 2015 +0200
Rediff 003_recognize_glibc_2.3.2_locale_names.diff.
diff --git a/debian/changelog b/debian/changelog
index ac2f649..e7d4f76 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ libx11 (2:1.6.3-1) UNRELEASED; urgency=medium
* Let uscan verify tarball signatures.
* New upstream release.
* Drop 006_tailor_pt_BR.UTF-8_Compose.diff, no longer necessary.
+ * Rediff 003_recognize_glibc_2.3.2_locale_names.diff.
-- Julien Cristau <jcristau@debian.org> Thu, 30 Apr 2015 20:20:21 +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 dbcb85e..9f097e1 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
@@ -51,10 +51,10 @@ but any bit would help. --Nathanael
Index: libx11/nls/compose.dir.pre
===================================================================
---- libx11.orig/nls/compose.dir.pre 2013-06-15 13:19:37.000000000 +0200
-+++ libx11/nls/compose.dir.pre 2013-06-15 17:34:15.927737867 +0200
-@@ -4,8 +4,13 @@
- XCOMM the second word is full locale name.
+--- libx11.orig/nls/compose.dir.pre
++++ libx11/nls/compose.dir.pre
+@@ -4,8 +4,13 @@ XCOMM The first word is the compose tabl
+ XCOMM and the second word is the full locale name.
XCOMM
XCOMM
+XCOMM Note that no Compose tables exist for ISO 8859-11, Microsoft code
@@ -67,7 +67,7 @@ Index: libx11/nls/compose.dir.pre
iso8859-6/Compose: ar_AA.ISO8859-6
iso8859-6/Compose: ar_AE.ISO8859-6
iso8859-6/Compose: ar_BH.ISO8859-6
-@@ -70,12 +75,15 @@
+@@ -70,12 +75,15 @@ iso8859-15/Compose: en_BE.ISO8859-15
iso8859-1/Compose: en_BW.ISO8859-1
iso8859-1/Compose: en_BZ.ISO8859-1
iso8859-1/Compose: en_CA.ISO8859-1
@@ -83,7 +83,7 @@ Index: libx11/nls/compose.dir.pre
iso8859-15/Compose: en_IN.ISO8859-15
iso8859-1/Compose: en_JM.ISO8859-1
iso8859-1/Compose: en_NZ.ISO8859-1
-@@ -124,6 +132,8 @@
+@@ -124,6 +132,8 @@ iso8859-13/Compose: et_EE.ISO8859-13
iso8859-15/Compose: et_EE.ISO8859-15
iso8859-1/Compose: eu_ES.ISO8859-1
iso8859-15/Compose: eu_ES.ISO8859-15
@@ -92,7 +92,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
-@@ -157,11 +167,9 @@
+@@ -157,11 +167,9 @@ iso8859-2/Compose: hr_HR.ISO8859-2
iso8859-2/Compose: hu_HU.ISO8859-2
armscii-8/Compose: hy_AM.ARMSCII-8
iso8859-1/Compose: id_ID.ISO8859-1
@@ -104,7 +104,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
-@@ -170,10 +178,10 @@
+@@ -170,10 +178,10 @@ ja.JIS/Compose: ja_JP.JIS7
georgian-academy/Compose: ka_GE.GEORGIAN-ACADEMY
georgian-ps/Compose: ka_GE.GEORGIAN-PS
iso8859-1/Compose: kl_GL.ISO8859-1
@@ -116,7 +116,7 @@ Index: libx11/nls/compose.dir.pre
ko/Compose: ko_KR.eucKR
ibm-cp1133/Compose: lo_LA.IBM-CP1133
mulelao-1/Compose: lo_LA.MULELAO-1
-@@ -202,15 +210,18 @@
+@@ -202,15 +210,18 @@ iso8859-1/Compose: ny_NO.ISO8859-1
iso8859-15/Compose: ny_NO.ISO8859-15
iso8859-1/Compose: oc_FR.ISO8859-1
iso8859-15/Compose: oc_FR.ISO8859-15
@@ -140,7 +140,7 @@ 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
-@@ -223,6 +234,9 @@
+@@ -223,6 +234,9 @@ iso8859-1/Compose: rw_RW.ISO8859-1
iso8859-2/Compose: sh_YU.ISO8859-2
iso8859-2/Compose: sk_SK.ISO8859-2
iso8859-2/Compose: sl_SI.ISO8859-2
@@ -150,7 +150,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
-@@ -261,12 +275,19 @@
+@@ -261,12 +275,19 @@ zh_CN/Compose: zh_CN.gb2312
zh_CN.gbk/Compose: zh_CN.gbk
zh_CN.gb18030/Compose: zh_CN.gb18030
zh_HK.big5/Compose: zh_HK.big5
@@ -170,15 +170,15 @@ Index: libx11/nls/compose.dir.pre
en_US.UTF-8/Compose: af_ZA.UTF-8
am_ET.UTF-8/Compose: am_ET.UTF-8
en_US.UTF-8/Compose: ar_AA.UTF-8
-@@ -298,6 +319,7 @@
- en_US.UTF-8/Compose: bn_BD.UTF-8
+@@ -297,6 +318,7 @@ en_US.UTF-8/Compose: bn_IN.UTF-8
+ en_US.UTF-8/Compose: bo_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
en_US.UTF-8/Compose: ca_FR.UTF-8
-@@ -358,6 +380,7 @@
+@@ -357,6 +379,7 @@ en_US.UTF-8/Compose: es_UY.UTF-8
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
@@ -186,7 +186,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
-@@ -368,6 +391,8 @@
+@@ -367,6 +390,8 @@ en_US.UTF-8/Compose: fr_FR.UTF-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
@@ -195,7 +195,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
-@@ -382,6 +407,7 @@
+@@ -381,6 +406,7 @@ en_US.UTF-8/Compose: is_IS.UTF-8
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
@@ -203,7 +203,7 @@ Index: libx11/nls/compose.dir.pre
ja_JP.UTF-8/Compose: ja_JP.UTF-8
en_US.UTF-8/Compose: ka_GE.UTF-8
en_US.UTF-8/Compose: kk_KZ.UTF-8
-@@ -400,6 +426,7 @@
+@@ -400,6 +426,7 @@ en_US.UTF-8/Compose: mai_IN.UTF-8
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
@@ -211,7 +211,7 @@ Index: libx11/nls/compose.dir.pre
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
-@@ -411,13 +438,19 @@
+@@ -411,13 +438,19 @@ en_US.UTF-8/Compose: no_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
@@ -234,7 +234,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
-@@ -433,9 +466,11 @@
+@@ -433,9 +466,11 @@ en_US.UTF-8/Compose: sd_IN@devanagari.U
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
@@ -246,7 +246,7 @@ Index: libx11/nls/compose.dir.pre
en_US.UTF-8/Compose: sq_AL.UTF-8
sr_CS.UTF-8/Compose: sr_CS.UTF-8
en_US.UTF-8/Compose: sr_ME.UTF-8
-@@ -451,6 +486,7 @@
+@@ -451,6 +486,7 @@ en_US.UTF-8/Compose: tg_TJ.UTF-8
th_TH.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
@@ -256,9 +256,9 @@ Index: libx11/nls/compose.dir.pre
en_US.UTF-8/Compose: tr_TR.UTF-8
Index: libx11/nls/locale.alias.pre
===================================================================
---- libx11.orig/nls/locale.alias.pre 2013-06-15 13:19:37.307909585 +0200
-+++ libx11/nls/locale.alias.pre 2013-06-15 17:14:09.031751432 +0200
-@@ -311,6 +311,12 @@
+--- libx11.orig/nls/locale.alias.pre
++++ libx11/nls/locale.alias.pre
+@@ -311,6 +311,12 @@ en_CA.iso88591: en_CA.ISO8859-1
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
@@ -271,7 +271,7 @@ Index: libx11/nls/locale.alias.pre
en_DL.utf8: en_DL.UTF-8
en_GB: en_GB.ISO8859-1
en_GB.88591: en_GB.ISO8859-1
-@@ -364,6 +370,16 @@
+@@ -364,6 +370,16 @@ en_US.8859-15: en_US.ISO8859-15
en_US.ISO8859-15@euro: en_US.ISO8859-15
en_US.utf8: en_US.UTF-8
EN_US.UTF-8: en_US.UTF-8
@@ -288,7 +288,7 @@ Index: libx11/nls/locale.alias.pre
en_ZA: en_ZA.ISO8859-1
en_ZA.88591: en_ZA.ISO8859-1
en_ZA.88591.en: en_ZA.ISO8859-1
-@@ -932,7 +948,6 @@
+@@ -932,7 +948,6 @@ pt_BR.88591.en: pt_BR.ISO8859-1
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
@@ -296,7 +296,7 @@ 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
-@@ -993,11 +1008,11 @@
+@@ -993,11 +1008,11 @@ XCOMM CS was the old ISO code for Serbia
XCOMM These lines should be deleted in the future.
sh: sr_RS.UTF-8@latin
sh_BA.ISO8859-2@bosnia: sr_CS.ISO8859-2
@@ -309,7 +309,7 @@ Index: libx11/nls/locale.alias.pre
sk: sk_SK.ISO8859-2
sk_SK: sk_SK.ISO8859-2
sk_SK.iso88592: sk_SK.ISO8859-2
-@@ -1210,7 +1225,7 @@
+@@ -1210,7 +1225,7 @@ XCOMM The following locale names are use
american.iso88591: en_US.ISO8859-1
arabic.iso88596: ar_AA.ISO8859-6
bokmal: nb_NO.ISO8859-1
@@ -318,7 +318,7 @@ Index: libx11/nls/locale.alias.pre
bulgarian: bg_BG.CP1251
c-french.iso88591: fr_CA.ISO8859-1
catalan: ca_ES.ISO8859-1
-@@ -1225,11 +1240,11 @@
+@@ -1225,11 +1240,11 @@ deutsch: de_DE.ISO8859-1
dutch: nl_NL.ISO8859-1
dutch.iso88591: nl_BE.ISO8859-1
eesti: et_EE.ISO8859-1
@@ -334,9 +334,9 @@ Index: libx11/nls/locale.alias.pre
galego: gl_ES.ISO8859-1
Index: libx11/nls/locale.dir.pre
===================================================================
---- libx11.orig/nls/locale.dir.pre 2013-06-15 13:19:37.307909585 +0200
-+++ libx11/nls/locale.dir.pre 2013-06-15 17:29:34.107741034 +0200
-@@ -6,8 +6,11 @@
+--- libx11.orig/nls/locale.dir.pre
++++ libx11/nls/locale.dir.pre
+@@ -6,8 +6,11 @@ XCOMM
XCOMM
C/XLC_LOCALE: C
@@ -348,7 +348,7 @@ Index: libx11/nls/locale.dir.pre
iso8859-6/XLC_LOCALE: ar_BH.ISO8859-6
iso8859-6/XLC_LOCALE: ar_DZ.ISO8859-6
iso8859-6/XLC_LOCALE: ar_EG.ISO8859-6
-@@ -36,6 +39,7 @@
+@@ -36,6 +39,7 @@ iso8859-2/XLC_LOCALE: bs_BA.ISO8859-2
iso8859-1/XLC_LOCALE: br_FR.ISO8859-1
iso8859-14/XLC_LOCALE: br_FR.ISO8859-14
iso8859-15/XLC_LOCALE: br_FR.ISO8859-15
@@ -356,7 +356,7 @@ Index: libx11/nls/locale.dir.pre
iso8859-1/XLC_LOCALE: ca_AD.ISO8859-1
iso8859-15/XLC_LOCALE: ca_AD.ISO8859-15
iso8859-1/XLC_LOCALE: ca_ES.ISO8859-1
-@@ -59,7 +63,7 @@
+@@ -59,7 +63,7 @@ iso8859-15/XLC_LOCALE: de_CH.ISO8859-1
iso8859-1/XLC_LOCALE: de_DE.ISO8859-1
iso8859-15/XLC_LOCALE: de_DE.ISO8859-15
iso8859-1/XLC_LOCALE: de_LI.ISO8859-1
@@ -365,7 +365,7 @@ Index: libx11/nls/locale.dir.pre
iso8859-1/XLC_LOCALE: de_LU.ISO8859-1
iso8859-15/XLC_LOCALE: de_LU.ISO8859-15
iso8859-7/XLC_LOCALE: el_GR.ISO8859-7
-@@ -71,12 +75,15 @@
+@@ -71,12 +75,15 @@ iso8859-15/XLC_LOCALE: en_BE.ISO8859-1
iso8859-1/XLC_LOCALE: en_BZ.ISO8859-1
iso8859-1/XLC_LOCALE: en_BW.ISO8859-1
iso8859-1/XLC_LOCALE: en_CA.ISO8859-1
@@ -381,7 +381,7 @@ 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
-@@ -90,7 +97,8 @@
+@@ -90,7 +97,8 @@ iso8859-15/XLC_LOCALE: en_US.ISO8859-1
iso8859-1/XLC_LOCALE: en_ZA.ISO8859-1
iso8859-15/XLC_LOCALE: en_ZA.ISO8859-15
iso8859-1/XLC_LOCALE: en_ZW.ISO8859-1
@@ -391,7 +391,7 @@ Index: libx11/nls/locale.dir.pre
iso8859-3/XLC_LOCALE: eo_XX.ISO8859-3
iso8859-1/XLC_LOCALE: es_AR.ISO8859-1
iso8859-1/XLC_LOCALE: es_BO.ISO8859-1
-@@ -125,6 +133,8 @@
+@@ -125,6 +133,8 @@ iso8859-13/XLC_LOCALE: et_EE.ISO8859-
iso8859-15/XLC_LOCALE: et_EE.ISO8859-15
iso8859-1/XLC_LOCALE: eu_ES.ISO8859-1
iso8859-15/XLC_LOCALE: eu_ES.ISO8859-15
@@ -400,7 +400,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
-@@ -176,6 +186,7 @@
+@@ -176,6 +186,7 @@ ko/XLC_LOCALE: ko_KR.eucKR
iso8859-1/XLC_LOCALE: kw_GB.ISO8859-1
iso8859-14/XLC_LOCALE: kw_GB.ISO8859-14
iso8859-15/XLC_LOCALE: kw_GB.ISO8859-15
@@ -408,7 +408,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
-@@ -203,8 +214,12 @@
+@@ -203,8 +214,12 @@ iso8859-1/XLC_LOCALE: ny_NO.ISO8859-1
iso8859-1/XLC_LOCALE: ny_NO.ISO8859-15
iso8859-1/XLC_LOCALE: oc_FR.ISO8859-1
iso8859-15/XLC_LOCALE: oc_FR.ISO8859-15
@@ -423,7 +423,7 @@ Index: libx11/nls/locale.dir.pre
iso8859-1/XLC_LOCALE: pd_US.ISO8859-1
iso8859-15/XLC_LOCALE: pd_US.ISO8859-15
iso8859-1/XLC_LOCALE: ph_PH.ISO8859-1
-@@ -224,6 +239,9 @@
+@@ -224,6 +239,9 @@ iso8859-1/XLC_LOCALE: rw_RW.IS
iso8859-2/XLC_LOCALE: sh_YU.ISO8859-2
iso8859-2/XLC_LOCALE: sk_SK.ISO8859-2
iso8859-2/XLC_LOCALE: sl_SI.ISO8859-2
@@ -433,7 +433,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
-@@ -238,8 +256,8 @@
+@@ -238,8 +256,8 @@ iso8859-1/XLC_LOCALE: sv_SE.ISO8859-1
iso8859-15/XLC_LOCALE: sv_SE.ISO8859-15
tscii-0/XLC_LOCALE: ta_IN.TSCII-0
koi8-c/XLC_LOCALE: tg_TJ.KOI8-C
@@ -443,7 +443,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
-@@ -263,10 +281,14 @@
+@@ -263,10 +281,14 @@ zh_CN.gbk/XLC_LOCALE: zh_CN.gbk
zh_CN.gb18030/XLC_LOCALE: zh_CN.gb18030
zh_HK.big5/XLC_LOCALE: zh_HK.big5
zh_HK.big5hkscs/XLC_LOCALE: zh_HK.big5hkscs
@@ -458,7 +458,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
-@@ -297,6 +319,7 @@
+@@ -297,6 +319,7 @@ en_US.UTF-8/XLC_LOCALE: bn_BD.UTF-8
en_US.UTF-8/XLC_LOCALE: bn_IN.UTF-8
en_US.UTF-8/XLC_LOCALE: bo_IN.UTF-8
en_US.UTF-8/XLC_LOCALE: br_FR.UTF-8
@@ -466,7 +466,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
-@@ -334,7 +357,8 @@
+@@ -334,7 +357,8 @@ en_US.UTF-8/XLC_LOCALE: en_UK.UTF-8
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: en_ZW.UTF-8
@@ -476,7 +476,7 @@ Index: libx11/nls/locale.dir.pre
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
-@@ -358,6 +382,7 @@
+@@ -358,6 +382,7 @@ en_US.UTF-8/XLC_LOCALE: es_UY.UTF-8
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
@@ -484,7 +484,7 @@ Index: libx11/nls/locale.dir.pre
en_US.UTF-8/XLC_LOCALE: fa_IR.UTF-8
en_US.UTF-8/XLC_LOCALE: fi_FI.UTF-8
en_US.UTF-8/XLC_LOCALE: fo_FO.UTF-8
-@@ -368,6 +393,8 @@
+@@ -368,6 +393,8 @@ en_US.UTF-8/XLC_LOCALE: fr_FR.UTF-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
@@ -493,7 +493,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
-@@ -382,6 +409,7 @@
+@@ -382,6 +409,7 @@ en_US.UTF-8/XLC_LOCALE: is_IS.UTF-8
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
@@ -501,7 +501,7 @@ Index: libx11/nls/locale.dir.pre
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: kk_KZ.UTF-8
-@@ -400,9 +428,11 @@
+@@ -401,9 +429,11 @@ en_US.UTF-8/XLC_LOCALE:
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
@@ -513,7 +513,7 @@ Index: libx11/nls/locale.dir.pre
en_US.UTF-8/XLC_LOCALE: nl_BE.UTF-8
en_US.UTF-8/XLC_LOCALE: nl_NL.UTF-8
en_US.UTF-8/XLC_LOCALE: nb_NO.UTF-8
-@@ -410,13 +440,19 @@
+@@ -411,13 +441,19 @@ en_US.UTF-8/XLC_LOCALE: nn_NO.UTF-8
en_US.UTF-8/XLC_LOCALE: no_NO.UTF-8
en_US.UTF-8/XLC_LOCALE: nr_ZA.UTF-8
en_US.UTF-8/XLC_LOCALE: nso_ZA.UTF-8
@@ -536,7 +536,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
-@@ -430,11 +466,13 @@
+@@ -431,11 +467,13 @@ en_US.UTF-8/XLC_LOCALE:
en_US.UTF-8/XLC_LOCALE: sd_IN.UTF-8
en_US.UTF-8/XLC_LOCALE: sd_IN@devanagari.UTF-8
en_US.UTF-8/XLC_LOCALE: se_NO.UTF-8
@@ -550,7 +550,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
-@@ -450,6 +488,7 @@
+@@ -451,6 +489,7 @@ en_US.UTF-8/XLC_LOCALE: tg_TJ.UTF-8
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 ccaebd90299799c5bb9e07346470230a00fcde24
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Apr 30 20:29:32 2015 +0200
Drop 006_tailor_pt_BR.UTF-8_Compose.diff, no longer necessary.
diff --git a/debian/changelog b/debian/changelog
index 61b92d2..ac2f649 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ libx11 (2:1.6.3-1) UNRELEASED; urgency=medium
* Let uscan verify tarball signatures.
* New upstream release.
+ * Drop 006_tailor_pt_BR.UTF-8_Compose.diff, no longer necessary.
-- Julien Cristau <jcristau@debian.org> Thu, 30 Apr 2015 20:20:21 +0200
diff --git a/debian/patches/006_tailor_pt_BR.UTF-8_Compose.diff b/debian/patches/006_tailor_pt_BR.UTF-8_Compose.diff
deleted file mode 100644
index 05c7989..0000000
--- a/debian/patches/006_tailor_pt_BR.UTF-8_Compose.diff
+++ /dev/null
@@ -1,4290 +0,0 @@
-Rewrite pt_BR.UTF-8/Compose to include en_US.UTF-8/Compose so that
-this file can be easily maintained. Replace <dead_acute>+<C> to match
-the definition from iso8859-1/Compose. Thanks Rafael Ávila de Espíndola
-(closes: #296599)
-
-This patch by Denis Barbier.
-
-Not submitted upstream to X.Org.
-
-Index: libx11/nls/pt_BR.UTF-8/Compose.pre
-===================================================================
---- libx11.orig/nls/pt_BR.UTF-8/Compose.pre 2013-06-15 13:19:37.000000000 +0200
-+++ libx11/nls/pt_BR.UTF-8/Compose.pre 2013-06-15 17:41:15.755733148 +0200
-@@ -1,4275 +1,3 @@
--XCOMM UTF-8 (Unicode) compose sequence
--XCOMM David.Monniaux@ens.fr
--XCOMM
--XCOMM Modified for Brazilian Portuguese by Gustavo Noronha Silva <kov@debian.org>
--
--XCOMM Part 1 - Manual definitions
--
--XCOMM Spacing versions of dead accents
--<dead_tilde> <space> : "~" asciitilde
--<dead_tilde> <dead_tilde> : "~" asciitilde
--<dead_acute> <space> : "'" apostrophe
--<dead_acute> <dead_acute> : "´" acute
--<dead_grave> <space> : "`" grave
--<dead_grave> <dead_grave> : "`" grave
--<dead_circumflex> <space> : "^" asciicircum
--<dead_circumflex> <dead_circumflex> : "^" asciicircum
--<dead_abovering> <space> : "°" degree
--<dead_abovering> <dead_abovering> : "°" degree
--<dead_macron> <space> : "¯" macron
--<dead_macron> <dead_macron> : "¯" macron
--<dead_breve> <space> : "˘" breve
--<dead_breve> <dead_breve> : "˘" breve
--<dead_abovedot> <space> : "˙" abovedot
--<dead_abovedot> <dead_abovedot> : "˙" abovedot
--<dead_diaeresis> <dead_diaeresis> : "¨" diaeresis
--<dead_diaeresis> <space> : "\"" quotedbl
--<dead_doubleacute> <space> : "˝" U2dd
--<dead_doubleacute> <dead_doubleacute> : "˝" U2dd
--<dead_caron> <space> : "ˇ" caron
--<dead_caron> <dead_caron> : "ˇ" caron
--<dead_cedilla> <space> : "¸" cedilla
--<dead_cedilla> <dead_cedilla> : "¸" cedilla
--<dead_ogonek> <space> : "˛" ogonek
--<dead_ogonek> <dead_ogonek> : "˛" ogonek
--<dead_iota> <space> : "ͺ" U37a
--<dead_iota> <dead_iota> : "ͺ" U37a
--
--XCOMM ASCII characters that may be difficult to access
--XCOMM on some keyboards.
--<Multi_key> <plus> <plus> : "#" numbersign
--<Multi_key> <apostrophe> <space> : "'" apostrophe
--<Multi_key> <space> <apostrophe> : "'" apostrophe
--<Multi_key> <A> <T> : "@" at
--<Multi_key> <parenleft> <parenleft> : "[" bracketleft
--<Multi_key> <slash> <slash> : "\\" backslash
--<Multi_key> <slash> <less> : "\\" backslash
--<Multi_key> <less> <slash> : "\\" backslash
--<Multi_key> <parenright> <parenright> : "]" bracketright
--
--<Multi_key> <asciicircum> <space> : "^" asciicircum
--<Multi_key> <space> <asciicircum> : "^" asciicircum
--<Multi_key> <greater> <space> : "^" asciicircum
--<Multi_key> <space> <greater> : "^" asciicircum
--
--<Multi_key> <grave> <space> : "`" grave
--<Multi_key> <space> <grave> : "`" grave
--
--<Multi_key> <parenleft> <minus> : "{" braceleft
--<Multi_key> <minus> <parenleft> : "{" braceleft
--
--<Multi_key> <slash> <asciicircum> : "|" bar
--<Multi_key> <asciicircum> <slash> : "|" bar
--<Multi_key> <V> <L> : "|" bar
--<Multi_key> <L> <V> : "|" bar
--<Multi_key> <v> <l> : "|" bar
--<Multi_key> <l> <v> : "|" bar
--
--<Multi_key> <parenright> <minus> : "}" braceright
--<Multi_key> <minus> <parenright> : "}" braceright
--
--<Multi_key> <asciitilde> <space> : "~" asciitilde
--<Multi_key> <space> <asciitilde> : "~" asciitilde
--<Multi_key> <minus> <space> : "~" asciitilde
--<Multi_key> <space> <minus> : "~" asciitilde
--
--XCOMM Spaces
--<Multi_key> <space> <space> : "\240" nobreakspace # NO-BREAK SPACE
--<Multi_key> <space> <period>: " " U2008 # PUNCTUATION SPACE
--
--<Multi_key> <o> <c> : "©" copyright
--<Multi_key> <o> <C> : "©" copyright
--<Multi_key> <O> <c> : "©" copyright
--<Multi_key> <O> <C> : "©" copyright
--
--<Multi_key> <o> <r> : "®" registered
--<Multi_key> <o> <R> : "®" registered
--<Multi_key> <O> <r> : "®" registered
--<Multi_key> <O> <R> : "®" registered
--
--<Multi_key> <period> <greater> : "›" U203a
--<Multi_key> <period> <less> : "‹" U2039
--<Multi_key> <period> <period> : "…" ellipsis
--<Multi_key> <period> <minus> : "·" periodcentered
--<Multi_key> <period> <equal> : "•" enfilledcircbullet
--<Multi_key> <exclam> <asciicircum> : "¦" brokenbar
--<Multi_key> <exclam> <exclam> : "¡" exclamdown
--<Multi_key> <p> <exclam> : "¶" paragraph
--<Multi_key> <P> <exclam> : "¶" paragraph
--<Multi_key> <plus> <minus> : "±" plusminus
--<Multi_key> <question> <question> : "¿" questiondown
--<Multi_key> <e> <e> : "Ə" U018f
--<Multi_key> <minus> <d> : "đ" dstroke
--<Multi_key> <minus> <D> : "Đ" Dstroke
--<Multi_key> <s> <s> : "ß" ssharp
--
--<Multi_key> <o> <e> : "œ" oe
--<Multi_key> <O> <E> : "Œ" OE
--<Multi_key> <a> <e> : "æ" ae
--<Multi_key> <A> <E> : "Æ" AE
--
--<Multi_key> <o> <o> : "°" degree # ^0 already taken
--
--XCOMM Quotation marks
--<Multi_key> <quotedbl> <backslash> : "〝" U301d # REVERSED DOUBLE PRIME QUOTATION MARK
--<Multi_key> <quotedbl> <slash> : "〞" U301e # DOUBLE PRIME QUOTATION MARK
--<Multi_key> <less> <less> : "«" guillemotleft # LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
--<Multi_key> <greater> <greater> : "»" guillemotright # RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
--<Multi_key> <less> <apostrophe> : "‘" U2018 # LEFT SINGLE QUOTATION MARK
--<Multi_key> <apostrophe> <less> : "‘" U2018 # LEFT SINGLE QUOTATION MARK
--<Multi_key> <greater> <apostrophe> : "’" U2019 # RIGHT SINGLE QUOTATION MARK
--<Multi_key> <apostrophe> <greater> : "’" U2019 # RIGHT SINGLE QUOTATION MARK
--<Multi_key> <comma> <apostrophe> : "‚" U201a # SINGLE LOW-9 QUOTATION MARK
--<Multi_key> <apostrophe> <comma> : "‚" U201a # SINGLE LOW-9 QUOTATION MARK
--<Multi_key> <less> <quotedbl> : "“" U201c # LEFT DOUBLE QUOTATION MARK
--<Multi_key> <quotedbl> <less> : "“" U201c # LEFT DOUBLE QUOTATION MARK
--<Multi_key> <greater> <quotedbl> : "”" U201d # RIGHT DOUBLE QUOTATION MARK
--<Multi_key> <quotedbl> <greater> : "”" U201d # RIGHT DOUBLE QUOTATION MARK
--<Multi_key> <comma> <quotedbl> : "„" U201e # DOUBLE LOW-9 QUOTATION MARK
--<Multi_key> <quotedbl> <comma> : "„" U201e # DOUBLE LOW-9 QUOTATION MARK
--
--XCOMM Per xxx
--<Multi_key> <percent> <o> : "‰" U2030 # PER MILLE SIGN
--
--XCOMM Currencies
--<Multi_key> <C> <E> : "₠" U20a0 # EURO-CURRENCY SIGN
--<Multi_key> <C> <slash> : "₡" U20a1 # COLON SIGN
--<Multi_key> <slash> <C> : "₡" U20a1 # COLON SIGN
--<Multi_key> <C> <r> : "₢" U20a2 # CRUZEIRO SIGN
--<Multi_key> <F> <r> : "₣" U20a3 # FRENCH FRANC SIGN
--<Multi_key> <L> <equal> : "₤" U20a4 # LIRA SIGN
--<Multi_key> <equal> <L> : "₤" U20a4 # LIRA SIGN
--<Multi_key> <m> <slash> : "₥" U20a5 # MILL SIGN
--<Multi_key> <slash> <m> : "₥" U20a5 # MILL SIGN
--<Multi_key> <N> <equal> : "₦" U20a6 # NAIRA SIGN
--<Multi_key> <equal> <N> : "₦" U20a6 # NAIRA SIGN
--<Multi_key> <P> <t> : "₧" U20a7 # PESETA SIGN
--<Multi_key> <R> <s> : "₨" U20a8 # RUPEE SIGN
--<Multi_key> <W> <equal> : "₩" U20a9 # WON SIGN
--<Multi_key> <equal> <W> : "₩" U20a9 # WON SIGN
--XCOMM "₪" U20aa NEW SHEQEL SIGN
--<Multi_key> <d> <minus> : "₫" U20ab # DONG SIGN
--<Multi_key> <C> <equal> : "€" EuroSign # EURO SIGN
--<Multi_key> <equal> <C> : "€" EuroSign # EURO SIGN
--<Multi_key> <c> <equal> : "€" EuroSign # EURO SIGN
--<Multi_key> <equal> <c> : "€" EuroSign # EURO SIGN
--<Multi_key> <E> <equal> : "€" EuroSign # EURO SIGN
--<Multi_key> <equal> <E> : "€" EuroSign # EURO SIGN
--<Multi_key> <e> <equal> : "€" EuroSign # EURO SIGN
--<Multi_key> <equal> <e> : "€" EuroSign # EURO SIGN
--
--<Multi_key> <L> <minus> : "£" sterling # POUND SIGN
--<Multi_key> <minus> <L> : "£" sterling # POUND SIGN
--<Multi_key> <Y> <equal> : "¥" yen
--<Multi_key> <equal><Y> : "¥" yen
--
--XCOMM Long S
--<Multi_key> <f> <s> : "ſ" U017f # LONG S
--<Multi_key> <f> <S> : "ſ" U017f # LONG S
--
--XCOMM Dashes
--<Multi_key> <minus> <minus> <period> : "–" U2013 # EN DASH
--<Multi_key> <minus> <minus> <minus> : "—" U2014 # EM DASH
--
--XCOMM Musical alterations
--<Multi_key> <numbersign> <b> : "♭" U266d # MUSIC FLAT SIGN
--<Multi_key> <numbersign> <f> : "♮" U266e # MUSIC NATURAL SIGN
--<Multi_key> <numbersign> <numbersign> : "♯" U266f # MUSIC SHARP SIGN
--
--XCOMM Other symbols
--<Multi_key> <s> <o> : "§" section # SECTION SIGN
--<Multi_key> <o> <s> : "§" section # SECTION SIGN
--
--<Multi_key> <o> <x> : "¤" currency
--<Multi_key> <x> <o> : "¤" currency
--
--<Multi_key> <P> <P> : "¶" paragraph # PILCROW SIGN (PARAGRAPH SIGN)
--
--<Multi_key> <question> <exclam> : "‽" U203D # INTERROBANG
--<Multi_key> <exclam> <question> : "‽" U203D # INTERROBANG
--
--XCOMM Part 2
--
--XCOMM Compose map for Korean Hangul(Choseongul) Conjoining Jamos automatically
--XCOMM generated from UnicodeData-2.0.14.txt at
--XCOMM ftp://ftp.unicode.org/Public/2.0-Update/UnicodeData-2.0.14.txt
--XCOMM by Jungshik Shin <jshin@jshin.net> 2002-10-17
--XCOMM There are some conflicts among sequences, but I left them alone.
--XCOMM
--XCOMM group 1: cluster jamos made of three basic jamos
--
--/* The following block gets overridden by later shorter compositions
-- <Multi_key> <U1107> <U1109> <U1100> : "ᄢ" U1122 : ᄇᅠ ᄉᅠ ᄀᅠ = ᄢᅠ
-- <Multi_key> <U1107> <U1109> <U1103> : "ᄣ" U1123 : ᄇᅠ ᄉᅠ ᄃᅠ = ᄣᅠ
-- <Multi_key> <U1107> <U1109> <U1107> : "ᄤ" U1124 : ᄇᅠ ᄉᅠ ᄇᅠ = ᄤᅠ
-- <Multi_key> <U1107> <U1109> <U1109> : "ᄥ" U1125 : ᄇᅠ ᄉᅠ ᄉᅠ = ᄥᅠ
-- <Multi_key> <U1107> <U1109> <U110c> : "ᄦ" U1126 : ᄇᅠ ᄉᅠ ᄌᅠ = ᄦᅠ
-- <Multi_key> <U1107> <U1107> <U110b> : "ᄬ" U112c : ᄇᅠ ᄇᅠ ᄋᅠ = ᄬᅠ
-- <Multi_key> <U1109> <U1107> <U1100> : "ᄳ" U1133 : ᄉᅠ ᄇᅠ ᄀᅠ = ᄳᅠ
-- <Multi_key> <U1109> <U1109> <U1109> : "ᄴ" U1134 : ᄉᅠ ᄉᅠ ᄉᅠ = ᄴᅠ
-- <Multi_key> <U1169> <U1161> <U1175> : "ᅫ" U116b : ᅟᅩ ᅟᅡ ᅟᅵ = ᅟᅫ
-- <Multi_key> <U116e> <U1165> <U1175> : "ᅰ" U1170 : ᅟᅮ ᅟᅥ ᅟᅵ = ᅟᅰ
-- <Multi_key> <U116e> <U1165> <U1173> : "ᆋ" U118b : ᅟᅮ ᅟᅥ ᅟᅳ = ᅟᆋ
-- <Multi_key> <U11a8> <U11ba> <U11a8> : "ᇄ" U11c4 : ᅟᅠᆨ ᅟᅠᆺ ᅟᅠᆨ = ᅟᅠᇄ
-- <Multi_key> <U11af> <U11a8> <U11ba> : "ᇌ" U11cc : ᅟᅠᆯ ᅟᅠᆨ ᅟᅠᆺ = ᅟᅠᇌ
-- <Multi_key> <U11af> <U11ae> <U11c2> : "ᇏ" U11cf : ᅟᅠᆯ ᅟᅠᆮ ᅟᅠᇂ = ᅟᅠᇏ
-- <Multi_key> <U11af> <U11b7> <U11a8> : "ᇑ" U11d1 : ᅟᅠᆯ ᅟᅠᆷ ᅟᅠᆨ = ᅟᅠᇑ
-- <Multi_key> <U11af> <U11b7> <U11ba> : "ᇒ" U11d2 : ᅟᅠᆯ ᅟᅠᆷ ᅟᅠᆺ = ᅟᅠᇒ
-- <Multi_key> <U11af> <U11b8> <U11ba> : "ᇓ" U11d3 : ᅟᅠᆯ ᅟᅠᆸ ᅟᅠᆺ = ᅟᅠᇓ
-- <Multi_key> <U11af> <U11b8> <U11c2> : "ᇔ" U11d4 : ᅟᅠᆯ ᅟᅠᆸ ᅟᅠᇂ = ᅟᅠᇔ
-- <Multi_key> <U11af> <U11b8> <U11bc> : "ᇕ" U11d5 : ᅟᅠᆯ ᅟᅠᆸ ᅟᅠᆼ = ᅟᅠᇕ
-- <Multi_key> <U11af> <U11ba> <U11ba> : "ᇖ" U11d6 : ᅟᅠᆯ ᅟᅠᆺ ᅟᅠᆺ = ᅟᅠᇖ
-- <Multi_key> <U11b7> <U11ba> <U11ba> : "ᇞ" U11de : ᅟᅠᆷ ᅟᅠᆺ ᅟᅠᆺ = ᅟᅠᇞ
-- <Multi_key> <U11bc> <U11a8> <U11a8> : "ᇭ" U11ed : ᅟᅠᆼ ᅟᅠᆨ ᅟᅠᆨ = ᅟᅠᇭ
-- */
-- <Multi_key> <U1100> <U1100> : "ᄁ" U1101 : ᄀᅠ ᄀᅠ = ᄁᅠ
-- <Multi_key> <U1103> <U1103> : "ᄄ" U1104 : ᄃᅠ ᄃᅠ = ᄄᅠ
-- <Multi_key> <U1107> <U1107> : "ᄈ" U1108 : ᄇᅠ ᄇᅠ = ᄈᅠ
-- <Multi_key> <U1109> <U1109> : "ᄊ" U110a : ᄉᅠ ᄉᅠ = ᄊᅠ
-- <Multi_key> <U110c> <U110c> : "ᄍ" U110d : ᄌᅠ ᄌᅠ = ᄍᅠ
-- <Multi_key> <U1102> <U1100> : "ᄓ" U1113 : ᄂᅠ ᄀᅠ = ᄓᅠ
-- <Multi_key> <U1102> <U1102> : "ᄔ" U1114 : ᄂᅠ ᄂᅠ = ᄔᅠ
-- <Multi_key> <U1102> <U1103> : "ᄕ" U1115 : ᄂᅠ ᄃᅠ = ᄕᅠ
-- <Multi_key> <U1102> <U1107> : "ᄖ" U1116 : ᄂᅠ ᄇᅠ = ᄖᅠ
-- <Multi_key> <U1103> <U1100> : "ᄗ" U1117 : ᄃᅠ ᄀᅠ = ᄗᅠ
-- <Multi_key> <U1105> <U1102> : "ᄘ" U1118 : ᄅᅠ ᄂᅠ = ᄘᅠ
-- <Multi_key> <U1105> <U1105> : "ᄙ" U1119 : ᄅᅠ ᄅᅠ = ᄙᅠ
-- <Multi_key> <U1105> <U1112> : "ᄚ" U111a : ᄅᅠ ᄒᅠ = ᄚᅠ
-- <Multi_key> <U1105> <U110b> : "ᄛ" U111b : ᄅᅠ ᄋᅠ = ᄛᅠ
-- <Multi_key> <U1106> <U1107> : "ᄜ" U111c : ᄆᅠ ᄇᅠ = ᄜᅠ
-- <Multi_key> <U1106> <U110b> : "ᄝ" U111d : ᄆᅠ ᄋᅠ = ᄝᅠ
-- <Multi_key> <U1107> <U1100> : "ᄞ" U111e : ᄇᅠ ᄀᅠ = ᄞᅠ
-- <Multi_key> <U1107> <U1102> : "ᄟ" U111f : ᄇᅠ ᄂᅠ = ᄟᅠ
-- <Multi_key> <U1107> <U1103> : "ᄠ" U1120 : ᄇᅠ ᄃᅠ = ᄠᅠ
-- <Multi_key> <U1107> <U1109> : "ᄡ" U1121 : ᄇᅠ ᄉᅠ = ᄡᅠ
-- <Multi_key> <U1107> <U110c> : "ᄧ" U1127 : ᄇᅠ ᄌᅠ = ᄧᅠ
-- <Multi_key> <U1107> <U110e> : "ᄨ" U1128 : ᄇᅠ ᄎᅠ = ᄨᅠ
-- <Multi_key> <U1107> <U1110> : "ᄩ" U1129 : ᄇᅠ ᄐᅠ = ᄩᅠ
-- <Multi_key> <U1107> <U1111> : "ᄪ" U112a : ᄇᅠ ᄑᅠ = ᄪᅠ
-- <Multi_key> <U1107> <U110b> : "ᄫ" U112b : ᄇᅠ ᄋᅠ = ᄫᅠ
-- <Multi_key> <U1109> <U1100> : "ᄭ" U112d : ᄉᅠ ᄀᅠ = ᄭᅠ
-- <Multi_key> <U1109> <U1102> : "ᄮ" U112e : ᄉᅠ ᄂᅠ = ᄮᅠ
-- <Multi_key> <U1109> <U1103> : "ᄯ" U112f : ᄉᅠ ᄃᅠ = ᄯᅠ
-- <Multi_key> <U1109> <U1105> : "ᄰ" U1130 : ᄉᅠ ᄅᅠ = ᄰᅠ
-- <Multi_key> <U1109> <U1106> : "ᄱ" U1131 : ᄉᅠ ᄆᅠ = ᄱᅠ
-- <Multi_key> <U1109> <U1107> : "ᄲ" U1132 : ᄉᅠ ᄇᅠ = ᄲᅠ
-- <Multi_key> <U1109> <U110b> : "ᄵ" U1135 : ᄉᅠ ᄋᅠ = ᄵᅠ
-- <Multi_key> <U1109> <U110c> : "ᄶ" U1136 : ᄉᅠ ᄌᅠ = ᄶᅠ
-- <Multi_key> <U1109> <U110e> : "ᄷ" U1137 : ᄉᅠ ᄎᅠ = ᄷᅠ
-- <Multi_key> <U1109> <U110f> : "ᄸ" U1138 : ᄉᅠ ᄏᅠ = ᄸᅠ
-- <Multi_key> <U1109> <U1110> : "ᄹ" U1139 : ᄉᅠ ᄐᅠ = ᄹᅠ
-- <Multi_key> <U1109> <U1111> : "ᄺ" U113a : ᄉᅠ ᄑᅠ = ᄺᅠ
-- <Multi_key> <U1109> <U1112> : "ᄻ" U113b : ᄉᅠ ᄒᅠ = ᄻᅠ
-- <Multi_key> <U113c> <U113c> : "ᄽ" U113d : ᄼᅠ ᄼᅠ = ᄽᅠ
-- <Multi_key> <U113e> <U113e> : "ᄿ" U113f : ᄾᅠ ᄾᅠ = ᄿᅠ
-- <Multi_key> <U110b> <U1100> : "ᅁ" U1141 : ᄋᅠ ᄀᅠ = ᅁᅠ
-- <Multi_key> <U110b> <U1103> : "ᅂ" U1142 : ᄋᅠ ᄃᅠ = ᅂᅠ
-- <Multi_key> <U110b> <U1106> : "ᅃ" U1143 : ᄋᅠ ᄆᅠ = ᅃᅠ
-- <Multi_key> <U110b> <U1107> : "ᅄ" U1144 : ᄋᅠ ᄇᅠ = ᅄᅠ
-- <Multi_key> <U110b> <U1109> : "ᅅ" U1145 : ᄋᅠ ᄉᅠ = ᅅᅠ
-- <Multi_key> <U110b> <U1140> : "ᅆ" U1146 : ᄋᅠ ᅀᅠ = ᅆᅠ
-- <Multi_key> <U110b> <U110b> : "ᅇ" U1147 : ᄋᅠ ᄋᅠ = ᅇᅠ
-- <Multi_key> <U110b> <U110c> : "ᅈ" U1148 : ᄋᅠ ᄌᅠ = ᅈᅠ
-- <Multi_key> <U110b> <U110e> : "ᅉ" U1149 : ᄋᅠ ᄎᅠ = ᅉᅠ
-- <Multi_key> <U110b> <U1110> : "ᅊ" U114a : ᄋᅠ ᄐᅠ = ᅊᅠ
-- <Multi_key> <U110b> <U1111> : "ᅋ" U114b : ᄋᅠ ᄑᅠ = ᅋᅠ
-- <Multi_key> <U110c> <U110b> : "ᅍ" U114d : ᄌᅠ ᄋᅠ = ᅍᅠ
-- <Multi_key> <U114e> <U114e> : "ᅏ" U114f : ᅎᅠ ᅎᅠ = ᅏᅠ
-- <Multi_key> <U1150> <U1150> : "ᅑ" U1151 : ᅐᅠ ᅐᅠ = ᅑᅠ
-- <Multi_key> <U110e> <U110f> : "ᅒ" U1152 : ᄎᅠ ᄏᅠ = ᅒᅠ
-- <Multi_key> <U110e> <U1112> : "ᅓ" U1153 : ᄎᅠ ᄒᅠ = ᅓᅠ
-- <Multi_key> <U1111> <U1107> : "ᅖ" U1156 : ᄑᅠ ᄇᅠ = ᅖᅠ
-- <Multi_key> <U1111> <U110b> : "ᅗ" U1157 : ᄑᅠ ᄋᅠ = ᅗᅠ
-- <Multi_key> <U1112> <U1112> : "ᅘ" U1158 : ᄒᅠ ᄒᅠ = ᅘᅠ
-- <Multi_key> <U1161> <U1175> : "ᅢ" U1162 : ᅟᅡ ᅟᅵ = ᅟᅢ
-- <Multi_key> <U1163> <U1175> : "ᅤ" U1164 : ᅟᅣ ᅟᅵ = ᅟᅤ
-- <Multi_key> <U1165> <U1175> : "ᅦ" U1166 : ᅟᅥ ᅟᅵ = ᅟᅦ
-- <Multi_key> <U1167> <U1175> : "ᅨ" U1168 : ᅟᅧ ᅟᅵ = ᅟᅨ
-- <Multi_key> <U1169> <U1161> : "ᅪ" U116a : ᅟᅩ ᅟᅡ = ᅟᅪ
-- <Multi_key> <U1169> <U1175> : "ᅬ" U116c : ᅟᅩ ᅟᅵ = ᅟᅬ
-- <Multi_key> <U116e> <U1165> : "ᅯ" U116f : ᅟᅮ ᅟᅥ = ᅟᅯ
-- <Multi_key> <U116e> <U1175> : "ᅱ" U1171 : ᅟᅮ ᅟᅵ = ᅟᅱ
-- <Multi_key> <U1173> <U1175> : "ᅴ" U1174 : ᅟᅳ ᅟᅵ = ᅟᅴ
-- <Multi_key> <U1161> <U1169> : "ᅶ" U1176 : ᅟᅡ ᅟᅩ = ᅟᅶ
-- <Multi_key> <U1161> <U116e> : "ᅷ" U1177 : ᅟᅡ ᅟᅮ = ᅟᅷ
-- <Multi_key> <U1163> <U1169> : "ᅸ" U1178 : ᅟᅣ ᅟᅩ = ᅟᅸ
-- <Multi_key> <U1163> <U116d> : "ᅹ" U1179 : ᅟᅣ ᅟᅭ = ᅟᅹ
-- <Multi_key> <U1165> <U1169> : "ᅺ" U117a : ᅟᅥ ᅟᅩ = ᅟᅺ
-- <Multi_key> <U1165> <U116e> : "ᅻ" U117b : ᅟᅥ ᅟᅮ = ᅟᅻ
-- <Multi_key> <U1165> <U1173> : "ᅼ" U117c : ᅟᅥ ᅟᅳ = ᅟᅼ
-- <Multi_key> <U1167> <U1169> : "ᅽ" U117d : ᅟᅧ ᅟᅩ = ᅟᅽ
-- <Multi_key> <U1167> <U116e> : "ᅾ" U117e : ᅟᅧ ᅟᅮ = ᅟᅾ
-- <Multi_key> <U1169> <U1165> : "ᅿ" U117f : ᅟᅩ ᅟᅥ = ᅟᅿ
-- <Multi_key> <U1169> <U1166> : "ᆀ" U1180 : ᅟᅩ ᅟᅦ = ᅟᆀ
-- <Multi_key> <U1169> <U1168> : "ᆁ" U1181 : ᅟᅩ ᅟᅨ = ᅟᆁ
-- <Multi_key> <U1169> <U1169> : "ᆂ" U1182 : ᅟᅩ ᅟᅩ = ᅟᆂ
-- <Multi_key> <U1169> <U116e> : "ᆃ" U1183 : ᅟᅩ ᅟᅮ = ᅟᆃ
-- <Multi_key> <U116d> <U1163> : "ᆄ" U1184 : ᅟᅭ ᅟᅣ = ᅟᆄ
-- <Multi_key> <U116d> <U1164> : "ᆅ" U1185 : ᅟᅭ ᅟᅤ = ᅟᆅ
-- <Multi_key> <U116d> <U1167> : "ᆆ" U1186 : ᅟᅭ ᅟᅧ = ᅟᆆ
-- <Multi_key> <U116d> <U1169> : "ᆇ" U1187 : ᅟᅭ ᅟᅩ = ᅟᆇ
-- <Multi_key> <U116d> <U1175> : "ᆈ" U1188 : ᅟᅭ ᅟᅵ = ᅟᆈ
-- <Multi_key> <U116e> <U1161> : "ᆉ" U1189 : ᅟᅮ ᅟᅡ = ᅟᆉ
-- <Multi_key> <U116e> <U1162> : "ᆊ" U118a : ᅟᅮ ᅟᅢ = ᅟᆊ
-- <Multi_key> <U116e> <U1168> : "ᆌ" U118c : ᅟᅮ ᅟᅨ = ᅟᆌ
Reply to: