Rebased ref, commits from common ancestor:
commit 6c4eda003be254b876ab83d17aeb4c090db77394
Author: Cyril Brulebois <k...@debian.org>
Date: Tue Jan 18 18:47:38 2011 +0100
Upload to experimental.
diff --git a/debian/changelog b/debian/changelog
index 96d2d7c..281edfd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-libx11 (2:1.4.1-2) UNRELEASED; urgency=low
+libx11 (2:1.4.1-2) experimental; urgency=low
* Make libx11-data break earlier versions of libx11-6, since those rely
on XKeysymDB, resulting in a non-functional keyboard and plenty of
such messages: “Internal error: Could not resolve keysym *”.
- -- Cyril Brulebois <k...@debian.org> Tue, 18 Jan 2011 18:14:47 +0100
+ -- Cyril Brulebois <k...@debian.org> Tue, 18 Jan 2011 18:47:22 +0100
libx11 (2:1.4.1-1) experimental; urgency=low
commit 058eaa35c30b3c05632a0b76d73b8415ac4e3df3
Author: Cyril Brulebois <k...@debian.org>
Date: Tue Jan 18 18:15:32 2011 +0100
Make libx11-data break earlier versions of libx11-6, since those rely on
XKeysymDB, resulting in a non-functional keyboard and plenty of such messages:
“Internal error: Could not resolve keysym *”.
diff --git a/debian/changelog b/debian/changelog
index d06c0bb..96d2d7c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+libx11 (2:1.4.1-2) UNRELEASED; urgency=low
+
+ * Make libx11-data break earlier versions of libx11-6, since those rely
+ on XKeysymDB, resulting in a non-functional keyboard and plenty of
+ such messages: “Internal error: Could not resolve keysym *”.
+
+ -- Cyril Brulebois <k...@debian.org> Tue, 18 Jan 2011 18:14:47 +0100
+
libx11 (2:1.4.1-1) experimental; urgency=low
[ Julien Cristau ]
diff --git a/debian/control b/debian/control
index 3b6714e..ef179a0 100644
--- a/debian/control
+++ b/debian/control
@@ -59,6 +59,7 @@ Package: libx11-data
Architecture: all
Depends: ${misc:Depends}
Replaces: libx11-6 (<= 2:1.0.0-1)
+Breaks: libx11-6 (<< 2:1.4.1)
Description: X11 client-side library
This package provides the locale data files for libx11.
.
commit b8c0fd2150ed0a4d0e51c592bce0877d5dac923f
Author: Cyril Brulebois <k...@debian.org>
Date: Thu Jan 13 01:18:46 2011 +0100
Upload to experimental.
diff --git a/debian/changelog b/debian/changelog
index e1a4b9e..d06c0bb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libx11 (2:1.4.1-1) UNRELEASED; urgency=low
+libx11 (2:1.4.1-1) experimental; urgency=low
[ Julien Cristau ]
* New upstream release.
@@ -29,7 +29,7 @@ libx11 (2:1.4.1-1) UNRELEASED; urgency=low
those files.
* Update debian/copyright from upstream COPYING.
- -- Robert Hooker <sarv...@ubuntu.com> Fri, 12 Nov 2010 21:23:09 -0500
+ -- Cyril Brulebois <k...@debian.org> Thu, 13 Jan 2011 01:18:40 +0100
libx11 (2:1.3.3-3) unstable; urgency=low
commit 081690dc05f16a0fd1d249389a47a81757b213e9
Author: Cyril Brulebois <k...@debian.org>
Date: Thu Jan 13 01:18:25 2011 +0100
Fix failure to patch when the tarball is used.
There's no specs/.gitignore in the tarball.
diff --git a/debian/patches/020_keep_xorg_css.diff
b/debian/patches/020_keep_xorg_css.diff
index 2e02e8e..9acece0 100644
--- a/debian/patches/020_keep_xorg_css.diff
+++ b/debian/patches/020_keep_xorg_css.diff
@@ -8,21 +8,12 @@ probably not a package we want to make all our packages
depend on.
So, as an interim measure, keep the local copy of that file.
-This reverts commit 8cbca8a10761d1ea75a75bafa647632d6c0dac71.
+This reverts commit 8cbca8a10761d1ea75a75bafa647632d6c0dac71 partially.
+Partially because specs/.gitignore is left out, since it's shipped in
+the tarball, trying to apply this patch with the hunk touching this file
+would lead to failure.
---
- specs/.gitignore | 1 +
- specs/xmlrules.in | 9 +++++----
- 2 files changed, 6 insertions(+), 4 deletions(-)
-diff --git a/specs/.gitignore b/specs/.gitignore
-index 6fa5c31..09b6a89 100644
---- a/specs/.gitignore
-+++ b/specs/.gitignore
-@@ -2,3 +2,4 @@
- *.ps
- *.pdf
- *.txt
-+*.css
diff --git a/specs/xmlrules.in b/specs/xmlrules.in
index 7687860..2af4130 100644
--- a/specs/xmlrules.in
commit bc57d3499a3ebcd8930acaf163a356b590f941c7
Author: Cyril Brulebois <k...@debian.org>
Date: Thu Jan 13 00:53:27 2011 +0100
Remove *.xml before running dh_install, there's no point in shipping those
files.
diff --git a/debian/changelog b/debian/changelog
index 428fbae..e1a4b9e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,6 +25,8 @@ libx11 (2:1.4.1-1) UNRELEASED; urgency=low
* Drop obsolete --enable-man-pages=3 from configure flags.
* Pass --with-xmlto and --without-fop for the documentation generation.
* Add xmlto, xorg-sgml-doctools, w3m build-dep accordingly.
+ * Remove *.xml before running dh_install, there's no point in shipping
+ those files.
* Update debian/copyright from upstream COPYING.
-- Robert Hooker <sarv...@ubuntu.com> Fri, 12 Nov 2010 21:23:09 -0500
diff --git a/debian/rules b/debian/rules
index b637459..a9e74cc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -99,6 +99,8 @@ binary-arch: build install
dh_testroot
dh_installdocs -s NEWS
+ # Kill *.xml files, we don't need them:
+ find debian/tmp -name '*.xml' -delete
# Using exclusions here allows libx11-6.install to use wildcards for
# headers and manpages, rather than listing every header and manpage
# other than these.
commit 2b2a16c2a019ee632c3b0f16a02eed186fbdf9b6
Author: Cyril Brulebois <k...@debian.org>
Date: Thu Jan 13 00:52:08 2011 +0100
Update debian/copyright from upstream COPYING.
diff --git a/debian/changelog b/debian/changelog
index 2353db6..428fbae 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,6 +25,7 @@ libx11 (2:1.4.1-1) UNRELEASED; urgency=low
* Drop obsolete --enable-man-pages=3 from configure flags.
* Pass --with-xmlto and --without-fop for the documentation generation.
* Add xmlto, xorg-sgml-doctools, w3m build-dep accordingly.
+ * Update debian/copyright from upstream COPYING.
-- Robert Hooker <sarv...@ubuntu.com> Fri, 12 Nov 2010 21:23:09 -0500
diff --git a/debian/copyright b/debian/copyright
index 467f6f1..0d563ab 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -16,7 +16,7 @@ to that file.
Copyright (C) 2003-2006,2008 Jamey Sharp, Josh Triplett
Copyright © 2009 Red Hat, Inc.
-Copyright © 1990-1992,1999,2000,2004,2009 Sun Microsystems, Inc.
+Copyright 1990-1992,1999,2000,2004,2009,2010 Oracle and/or its affiliates.
All rights reserved.
Permission is hereby granted, free of charge, to any person obtaining a
@@ -942,6 +942,3 @@ LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES
OR ANY DAMAGES
WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-
-vim:set ai et sw=4 sts=4 tw=72:
commit c6df60339b3b6f05410fc7ee5d74f961216c3634
Author: Cyril Brulebois <k...@debian.org>
Date: Wed Jan 12 22:09:04 2011 +0100
Add xmlto, xorg-sgml-doctools, w3m build-dep accordingly.
diff --git a/debian/changelog b/debian/changelog
index df640fd..2353db6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -24,6 +24,7 @@ libx11 (2:1.4.1-1) UNRELEASED; urgency=low
- _XSetSeqSyncFunction@Base
* Drop obsolete --enable-man-pages=3 from configure flags.
* Pass --with-xmlto and --without-fop for the documentation generation.
+ * Add xmlto, xorg-sgml-doctools, w3m build-dep accordingly.
-- Robert Hooker <sarv...@ubuntu.com> Fri, 12 Nov 2010 21:23:09 -0500
diff --git a/debian/control b/debian/control
index b59a76f..3b6714e 100644
--- a/debian/control
+++ b/debian/control
@@ -19,6 +19,10 @@ Build-Depends:
libtool,
xutils-dev (>= 1:7.5+5),
# specs
+ xmlto,
+ xorg-sgml-doctools (>= 1:1.5),
+ w3m,
+# specs (might be outdated now)
groff,
ghostscript,
netpbm,
commit 041f593e1d5432a9d01f1532ae363b79a4e1069b
Author: Cyril Brulebois <k...@debian.org>
Date: Wed Jan 12 22:07:05 2011 +0100
Pass --with-xmlto and --without-fop for the documentation generation.
diff --git a/debian/changelog b/debian/changelog
index 4a716f3..df640fd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,6 +23,7 @@ libx11 (2:1.4.1-1) UNRELEASED; urgency=low
- _XSetPrivSyncFunction@Base
- _XSetSeqSyncFunction@Base
* Drop obsolete --enable-man-pages=3 from configure flags.
+ * Pass --with-xmlto and --without-fop for the documentation generation.
-- Robert Hooker <sarv...@ubuntu.com> Fri, 12 Nov 2010 21:23:09 -0500
diff --git a/debian/rules b/debian/rules
index 17df37d..b637459 100755
--- a/debian/rules
+++ b/debian/rules
@@ -57,6 +57,8 @@ build-stamp: configure $(STAMP_DIR)/genscripts
--mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info \
--enable-specs \
+ --with-xmlto \
+ --without-fop \
$(confflags) \
CFLAGS="$(CFLAGS)"
cd build && $(MAKE)
commit aa2beed935b8217af303766ecd19ee665da508fe
Author: Cyril Brulebois <k...@debian.org>
Date: Wed Jan 12 22:06:06 2011 +0100
Drop obsolete --enable-man-pages=3 from configure flags.
diff --git a/debian/changelog b/debian/changelog
index a74f3f7..4a716f3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,6 +22,7 @@ libx11 (2:1.4.1-1) UNRELEASED; urgency=low
- _XIDHandler@Base
- _XSetPrivSyncFunction@Base
- _XSetSeqSyncFunction@Base
+ * Drop obsolete --enable-man-pages=3 from configure flags.
-- Robert Hooker <sarv...@ubuntu.com> Fri, 12 Nov 2010 21:23:09 -0500
diff --git a/debian/rules b/debian/rules
index 6a677c1..17df37d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -42,8 +42,6 @@ else
confflags += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
endif
-confflags += --enable-man-pages=3
-
configure: $(STAMP_DIR)/patch
dh_testdir
autoreconf -vfi
commit 749e7a035d0e6bcbef27961e96b3021525325f01
Author: Cyril Brulebois <k...@debian.org>
Date: Wed Jan 12 22:04:20 2011 +0100
Drop hidden-by-upstream functions from symbols file.
Some functions got hidden by upstream in aebbf36238, since “none of the
functions in Xprivate.h should have any callers outside of Xlib, by
definition”. As a consequence, drop the following symbols from
libx11-6.symbols:
- _XIDHandler@Base
- _XSetPrivSyncFunction@Base
- _XSetSeqSyncFunction@Base
diff --git a/debian/changelog b/debian/changelog
index a206ff8..a74f3f7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,7 +4,6 @@ libx11 (2:1.4.1-1) UNRELEASED; urgency=low
* New upstream release.
- lots of fixes for multithreaded apps
- X11 users can now compose anarchism (closes: #555938)
- * Hide _XSeqSyncFunction.
[ Robert Hooker ]
* New upstream release.
@@ -16,6 +15,13 @@ libx11 (2:1.4.1-1) UNRELEASED; urgency=low
* As a temporary measure, add 020_keep_xorg_css.diff to avoid having to
depend on xorg-sgml-doctools just for xorg.css.
* Refresh all patches.
+ * Some functions got hidden by upstream in aebbf36238, since “none of
+ the functions in Xprivate.h should have any callers outside of Xlib,
+ by definition”. As a consequence, drop the following symbols from
+ libx11-6.symbols:
+ - _XIDHandler@Base
+ - _XSetPrivSyncFunction@Base
+ - _XSetSeqSyncFunction@Base
-- Robert Hooker <sarv...@ubuntu.com> Fri, 12 Nov 2010 21:23:09 -0500
diff --git a/debian/libx11-6.symbols b/debian/libx11-6.symbols
index 8f91786..081115a 100644
--- a/debian/libx11-6.symbols
+++ b/debian/libx11-6.symbols
@@ -826,7 +826,6 @@ libX11.so.6 libx11-6 #MINVER#
_XGetScanlinePad@Base 0
_XGetWindowAttributes@Base 0
(optional)_XHeadOfDisplayList@Base 0 1
- (optional)_XIDHandler@Base 0 1
(optional)_XIMCompileResourceList@Base 0 1
_XIOError@Base 0
_XIOErrorFunction@Base 0
@@ -868,8 +867,6 @@ libX11.so.6 libx11-6 #MINVER#
_XSetClipRectangles@Base 0
_XSetImage@Base 0
_XSetLastRequestRead@Base 0
- (optional)_XSetPrivSyncFunction@Base 0 1
- (optional)_XSetSeqSyncFunction@Base 0 1
_XStoreEventCookie@Base 2:1.2.99.901
_XTextHeight16@Base 0
_XTextHeight@Base 0
commit f257005dd76b504768648a54f6bb4847bec5d5f9
Author: Cyril Brulebois <k...@debian.org>
Date: Wed Jan 12 21:30:27 2011 +0100
Refresh all patches.
diff --git a/debian/changelog b/debian/changelog
index 4507779..a206ff8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,7 @@ libx11 (2:1.4.1-1) UNRELEASED; urgency=low
* New new (new) upstream release.
* As a temporary measure, add 020_keep_xorg_css.diff to avoid having to
depend on xorg-sgml-doctools just for xorg.css.
+ * Refresh all patches.
-- Robert Hooker <sarv...@ubuntu.com> Fri, 12 Nov 2010 21:23:09 -0500
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 8c2d076..fa03371 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
@@ -55,11 +55,9 @@ Major "forward port" by Nathanael Nerode.
Partially submitted upstream. This is so large I don't expect it to all go in
at once,
but any bit would help. --Nathanael
-Index: libx11/nls/compose.dir.pre
-===================================================================
---- libx11.orig/nls/compose.dir.pre
-+++ libx11/nls/compose.dir.pre
-@@ -4,9 +4,17 @@
+--- a/nls/compose.dir.pre
++++ b/nls/compose.dir.pre
+@@ -4,9 +4,17 @@ XCOMM The first word is the compose tabl
XCOMM the second word is full locale name.
XCOMM
XCOMM
@@ -77,7 +75,7 @@ Index: libx11/nls/compose.dir.pre
iso8859-6/Compose: ar_BH.ISO8859-6
iso8859-6/Compose: ar_DZ.ISO8859-6
iso8859-6/Compose: ar_EG.ISO8859-6
-@@ -19,13 +27,17 @@
+@@ -19,13 +27,17 @@ iso8859-6/Compose: ar_MA.ISO8859-6
iso8859-6/Compose: ar_OM.ISO8859-6
iso8859-6/Compose: ar_QA.ISO8859-6
iso8859-6/Compose: ar_SA.ISO8859-6
@@ -96,7 +94,7 @@ Index: libx11/nls/compose.dir.pre
iso8859-1/Compose: br_FR.ISO8859-1
iso8859-14/Compose: br_FR.ISO8859-14
iso8859-15/Compose: br_FR.ISO8859-15
-@@ -46,6 +58,8 @@
+@@ -46,6 +58,8 @@ iso8859-1/Compose: da_DK.ISO8859-1
iso8859-15/Compose: da_DK.ISO8859-15
iso8859-1/Compose: de_AT.ISO8859-1
iso8859-15/Compose: de_AT.ISO8859-15
@@ -105,7 +103,7 @@ Index: libx11/nls/compose.dir.pre
iso8859-1/Compose: de_CH.ISO8859-1
iso8859-15/Compose: de_CH.ISO8859-15
iso8859-1/Compose: de_DE.ISO8859-1
-@@ -55,15 +69,26 @@
+@@ -55,15 +69,26 @@ iso8859-15/Compose: de_LI.ISO8859-15
iso8859-1/Compose: de_LU.ISO8859-1
iso8859-15/Compose: de_LU.ISO8859-15
iso8859-7/Compose: el_GR.ISO8859-7
@@ -132,7 +130,7 @@ 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
-@@ -71,6 +96,7 @@
+@@ -71,6 +96,7 @@ iso8859-1/Compose: en_US.ISO8859-1
iso8859-15/Compose: en_US.ISO8859-15
iso8859-1/Compose: en_ZA.ISO8859-1
iso8859-15/Compose: en_ZA.ISO8859-15
@@ -140,7 +138,7 @@ Index: libx11/nls/compose.dir.pre
iso8859-3/Compose: eo_XX.ISO8859-3
iso8859-1/Compose: es_AR.ISO8859-1
iso8859-1/Compose: es_BO.ISO8859-1
-@@ -90,6 +116,7 @@
+@@ -90,6 +116,7 @@ iso8859-1/Compose: es_PE.ISO8859-1
iso8859-1/Compose: es_PR.ISO8859-1
iso8859-1/Compose: es_PY.ISO8859-1
iso8859-1/Compose: es_SV.ISO8859-1
@@ -148,7 +146,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
-@@ -98,6 +125,8 @@
+@@ -98,6 +125,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
@@ -157,7 +155,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
-@@ -131,11 +160,9 @@
+@@ -131,11 +160,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
@@ -169,7 +167,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
-@@ -144,14 +171,20 @@
+@@ -144,14 +171,20 @@ 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
@@ -192,7 +190,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
-@@ -178,25 +211,33 @@
+@@ -178,25 +211,33 @@ 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
@@ -230,7 +228,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
-@@ -210,35 +251,53 @@
+@@ -210,35 +251,53 @@ 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
@@ -290,7 +288,7 @@ Index: libx11/nls/compose.dir.pre
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
-@@ -252,16 +311,19 @@
+@@ -252,16 +311,19 @@ en_US.UTF-8/Compose: ar_MA.UTF-8
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
@@ -311,7 +309,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,17 +341,25 @@
+@@ -279,17 +341,25 @@ en_US.UTF-8/Compose: de_LU.UTF-8
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
@@ -337,7 +335,7 @@ Index: libx11/nls/compose.dir.pre
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
-@@ -313,6 +383,7 @@
+@@ -313,6 +383,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
@@ -345,7 +343,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 +394,8 @@
+@@ -323,6 +394,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
@@ -354,7 +352,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
-@@ -337,10 +410,12 @@
+@@ -337,10 +410,12 @@ 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
@@ -367,7 +365,7 @@ Index: libx11/nls/compose.dir.pre
en_US.UTF-8/Compose: kn_IN.UTF-8
en_US.UTF-8/Compose: ko_KR.UTF-8
en_US.UTF-8/Compose: ks_IN.UTF-8
-@@ -354,9 +429,11 @@
+@@ -354,9 +429,11 @@ 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
@@ -379,7 +377,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
-@@ -364,13 +441,19 @@
+@@ -364,13 +441,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
@@ -402,7 +400,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
-@@ -383,10 +466,14 @@
+@@ -383,10 +466,14 @@ en_US.UTF-8/Compose: rw_RW.UTF-8
en_US.UTF-8/Compose: sa_IN.UTF-8
en_US.UTF-8/Compose: sd_IN.UTF-8
en_US.UTF-8/Compose: sd...@devanagari.utf-8
@@ -417,7 +415,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
-@@ -400,6 +487,9 @@
+@@ -400,6 +487,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
@@ -427,11 +425,9 @@ Index: libx11/nls/compose.dir.pre
en_US.UTF-8/Compose: tl_PH.UTF-8
en_US.UTF-8/Compose: tn_ZA.UTF-8
en_US.UTF-8/Compose: tr_TR.UTF-8
-Index: libx11/nls/locale.alias.pre
-===================================================================
---- libx11.orig/nls/locale.alias.pre
-+++ libx11/nls/locale.alias.pre
-@@ -306,6 +306,12 @@
+--- a/nls/locale.alias.pre
++++ b/nls/locale.alias.pre
+@@ -308,6 +308,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
@@ -444,7 +440,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,16 @@
+@@ -356,6 +362,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
@@ -461,7 +457,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
-@@ -725,6 +741,10 @@
+@@ -727,6 +743,10 @@ kl_GL.iso88591:
kl_GL.ISO8859-1
kl_GL.ISO-8859-1: kl_GL.ISO8859-1
kl_GL.iso885915: kl_GL.ISO8859-15
kl_GL.utf8: kl_GL.UTF-8
@@ -472,7 +468,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
-@@ -923,7 +943,6 @@
+@@ -927,7 +947,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
@@ -480,7 +476,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
-@@ -984,11 +1003,11 @@
+@@ -988,11 +1007,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
@@ -493,7 +489,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
-@@ -1197,7 +1216,7 @@
+@@ -1201,7 +1220,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
@@ -502,7 +498,7 @@ Index: libx11/nls/locale.alias.pre
bulgarian: bg_BG.CP1251
c-french.iso88591: fr_CA.ISO8859-1
catalan: ca_ES.ISO8859-1
-@@ -1212,11 +1231,11 @@
+@@ -1216,11 +1235,11 @@ deutsch:
de_DE.ISO8859-1
dutch: nl_NL.ISO8859-1
dutch.iso88591: nl_BE.ISO8859-1
eesti: et_EE.ISO8859-1
@@ -516,7 +512,7 @@ Index: libx11/nls/locale.alias.pre
french: fr_FR.ISO8859-1
french.iso88591: fr_CH.ISO8859-1
galego: gl_ES.ISO8859-1
-@@ -1225,8 +1244,8 @@
+@@ -1229,8 +1248,8 @@ german:
de_DE.ISO8859-1
german.iso88591: de_CH.ISO8859-1
greek: el_GR.ISO8859-7
greek.iso88597: el_GR.ISO8859-7
@@ -527,11 +523,9 @@ Index: libx11/nls/locale.alias.pre
hrvatski: hr_HR.ISO8859-2
hungarian: hu_HU.ISO8859-2
icelandic.iso88591: is_IS.ISO8859-1
-Index: libx11/nls/locale.dir.pre
-===================================================================
---- libx11.orig/nls/locale.dir.pre
-+++ libx11/nls/locale.dir.pre
-@@ -6,8 +6,13 @@
+--- a/nls/locale.dir.pre
++++ b/nls/locale.dir.pre
+@@ -6,8 +6,13 @@ XCOMM
XCOMM
C/XLC_LOCALE: C
@@ -545,7 +539,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
-@@ -35,6 +40,7 @@
+@@ -35,6 +40,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
@@ -553,7 +547,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
-@@ -47,7 +53,6 @@
+@@ -47,7 +53,6 @@ iso8859-2/XLC_LOCALE: cs_CZ.ISO8859-2
iso8859-1/XLC_LOCALE: cy_GB.ISO8859-1
iso8859-14/XLC_LOCALE: cy_GB.ISO8859-14
iso8859-15/XLC_LOCALE: cy_GB.ISO8859-15
@@ -561,7 +555,7 @@ Index: libx11/nls/locale.dir.pre
iso8859-1/XLC_LOCALE: da_DK.ISO8859-1
iso8859-15/XLC_LOCALE: da_DK.ISO8859-15
iso8859-1/XLC_LOCALE: de_AT.ISO8859-1
-@@ -59,20 +64,25 @@
+@@ -59,20 +64,25 @@ 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
@@ -588,7 +582,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
-@@ -85,7 +95,9 @@
+@@ -85,7 +95,9 @@ iso8859-1/XLC_LOCALE: en_US.ISO8859-1
iso8859-15/XLC_LOCALE: en_US.ISO8859-15
iso8859-1/XLC_LOCALE: en_ZA.ISO8859-1
iso8859-15/XLC_LOCALE: en_ZA.ISO8859-15
@@ -599,7 +593,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
-@@ -114,6 +126,8 @@
+@@ -114,6 +126,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
@@ -608,7 +602,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
-@@ -162,6 +176,7 @@
+@@ -162,6 +176,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
@@ -616,7 +610,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
-@@ -189,8 +204,12 @@
+@@ -189,8 +204,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
@@ -631,7 +625,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
-@@ -200,11 +219,15 @@
+@@ -200,11 +219,15 @@ iso8859-2/XLC_LOCALE: ro_RO.ISO8859-2
iso8859-5/XLC_LOCALE: ru_RU.ISO8859-5
microsoft-cp1251/XLC_LOCALE: ru_RU.CP1251
koi8-r/XLC_LOCALE: ru_RU.KOI8-R
@@ -647,7 +641,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
-@@ -219,8 +242,8 @@
+@@ -219,8 +242,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
@@ -657,7 +651,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
-@@ -231,6 +254,7 @@
+@@ -231,6 +254,7 @@ iso8859-5/XLC_LOCALE: uk_UA.ISO8859-5
microsoft-cp1251/XLC_LOCALE: uk_UA.CP1251
koi8-u/XLC_LOCALE: uk_UA.KOI8-U
microsoft-cp1256/XLC_LOCALE: ur_PK.CP1256
@@ -665,7 +659,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
-@@ -246,10 +270,17 @@
+@@ -246,10 +270,17 @@ zh_HK.big5hkscs/XLC_LOCALE: zh_HK.big5-
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
@@ -683,7 +677,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
-@@ -274,13 +305,13 @@
+@@ -274,13 +305,13 @@ en_US.UTF-8/XLC_LOCALE: ar_TN.UTF-8
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
@@ -698,7 +692,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
-@@ -299,18 +330,26 @@
+@@ -299,18 +330,26 @@ en_US.UTF-8/XLC_LOCALE: el_CY.UTF-8
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
@@ -726,7 +720,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
-@@ -334,6 +373,7 @@
+@@ -334,6 +373,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
@@ -734,7 +728,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
-@@ -344,6 +384,8 @@
+@@ -344,6 +384,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
@@ -743,7 +737,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 +400,12 @@
+@@ -358,10 +400,12 @@ 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
@@ -756,7 +750,7 @@ Index: libx11/nls/locale.dir.pre
en_US.UTF-8/XLC_LOCALE: kn_IN.UTF-8
en_US.UTF-8/XLC_LOCALE: ks_IN.UTF-8
en_US.UTF-8/XLC_LOCALE: ks...@devanagari.utf-8
-@@ -375,23 +419,31 @@
+@@ -375,23 +419,31 @@ 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
@@ -791,7 +785,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
-@@ -405,11 +457,13 @@
+@@ -405,11 +457,13 @@ en_US.UTF-8/XLC_LOCALE:
en_US.UTF-8/XLC_LOCALE: sd_IN.UTF-8
en_US.UTF-8/XLC_LOCALE: sd...@devanagari.utf-8
en_US.UTF-8/XLC_LOCALE: se_NO.UTF-8
@@ -805,7 +799,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
-@@ -425,6 +479,7 @@
+@@ -425,6 +479,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
diff --git a/debian/patches/006_tailor_pt_BR.UTF-8_Compose.diff
b/debian/patches/006_tailor_pt_BR.UTF-8_Compose.diff
index 395d834..65b8837 100644
--- a/debian/patches/006_tailor_pt_BR.UTF-8_Compose.diff
+++ b/debian/patches/006_tailor_pt_BR.UTF-8_Compose.diff
@@ -7,10 +7,8 @@ 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
-+++ libx11/nls/pt_BR.UTF-8/Compose.pre
+--- a/nls/pt_BR.UTF-8/Compose.pre
++++ b/nls/pt_BR.UTF-8/Compose.pre
@@ -1,4275 +1,3 @@
-XCOMM UTF-8 (Unicode) compose sequence
-XCOMM david.monni...@ens.fr
diff --git a/debian/patches/007_iso8859-15_Compose_fix.diff
b/debian/patches/007_iso8859-15_Compose_fix.diff
index bdc2e81..cbe74c7 100644
--- a/debian/patches/007_iso8859-15_Compose_fix.diff
+++ b/debian/patches/007_iso8859-15_Compose_fix.diff
@@ -6,11 +6,9 @@ Account for lack of spacing diaeresis key and codepoint.
http://bugs.debian.org/97433
-Index: libx11/nls/iso8859-15/Compose.pre
-===================================================================
---- libx11.orig/nls/iso8859-15/Compose.pre
-+++ libx11/nls/iso8859-15/Compose.pre
-@@ -155,8 +155,7 @@
+--- a/nls/iso8859-15/Compose.pre
++++ b/nls/iso8859-15/Compose.pre
+@@ -155,8 +155,7 @@ XCOMM Special Character
<Multi_key> <minus> <colon> : "\367" division
<Multi_key> <colon> <minus> : "\367" division
<Multi_key> <x> <x> : "\327" multiply
@@ -20,7 +18,7 @@ Index: libx11/nls/iso8859-15/Compose.pre
<Multi_key> <quotedbl> <quotedbl> : "\"" quotedbl
XCOMM Accented Alphabet
<Multi_key> <A> <grave> : "\300" Agrave
-@@ -175,8 +174,6 @@
+@@ -175,8 +174,6 @@ XCOMM Accented Alphabet
<Multi_key> <minus> <A> : "\303" Atilde
<Multi_key> <A> <quotedbl> : "\304" Adiaeresis
<Multi_key> <quotedbl> <A> : "\304" Adiaeresis
@@ -29,7 +27,7 @@ Index: libx11/nls/iso8859-15/Compose.pre
<Multi_key> <A> <asterisk> : "\305" Aring
<Multi_key> <asterisk> <A> : "\305" Aring
<Multi_key> <A> <A> : "\305" Aring
-@@ -198,8 +195,6 @@
+@@ -198,8 +195,6 @@ XCOMM Accented Alphabet
<Multi_key> <minus> <a> : "\343" atilde
<Multi_key> <a> <quotedbl> : "\344" adiaeresis
<Multi_key> <quotedbl> <a> : "\344" adiaeresis
@@ -38,7 +36,7 @@ Index: libx11/nls/iso8859-15/Compose.pre
<Multi_key> <a> <asterisk> : "\345" aring
<Multi_key> <asterisk> <a> : "\345" aring
<Multi_key> <a> <a> : "\345" aring
-@@ -231,8 +226,6 @@
+@@ -231,8 +226,6 @@ XCOMM Accented Alphabet
<Multi_key> <greater> <E> : "\312" Ecircumflex
<Multi_key> <E> <quotedbl> : "\313" Ediaeresis
<Multi_key> <quotedbl> <E> : "\313" Ediaeresis
@@ -47,7 +45,7 @@ Index: libx11/nls/iso8859-15/Compose.pre
<Multi_key> <e> <grave> : "\350" egrave
<Multi_key> <grave> <e> : "\350" egrave
<Multi_key> <e> <acute> : "\351" eacute
-@@ -245,8 +238,6 @@
+@@ -245,8 +238,6 @@ XCOMM Accented Alphabet
<Multi_key> <greater> <e> : "\352" ecircumflex
<Multi_key> <e> <quotedbl> : "\353" ediaeresis
<Multi_key> <quotedbl> <e> : "\353" ediaeresis
@@ -56,7 +54,7 @@ Index: libx11/nls/iso8859-15/Compose.pre
<Multi_key> <I> <grave> : "\314" Igrave
<Multi_key> <grave> <I> : "\314" Igrave
<Multi_key> <I> <acute> : "\315" Iacute
-@@ -259,8 +250,6 @@
+@@ -259,8 +250,6 @@ XCOMM Accented Alphabet
<Multi_key> <greater> <I> : "\316" Icircumflex
<Multi_key> <I> <quotedbl> : "\317" Idiaeresis
<Multi_key> <quotedbl> <I> : "\317" Idiaeresis
@@ -65,7 +63,7 @@ Index: libx11/nls/iso8859-15/Compose.pre
<Multi_key> <i> <grave> : "\354" igrave
<Multi_key> <grave> <i> : "\354" igrave
<Multi_key> <i> <acute> : "\355" iacute
-@@ -273,8 +262,6 @@
+@@ -273,8 +262,6 @@ XCOMM Accented Alphabet
<Multi_key> <greater> <i> : "\356" icircumflex
<Multi_key> <i> <quotedbl> : "\357" idiaeresis
<Multi_key> <quotedbl> <i> : "\357" idiaeresis
@@ -74,7 +72,7 @@ Index: libx11/nls/iso8859-15/Compose.pre
<Multi_key> <N> <asciitilde> : "\321" Ntilde
<Multi_key> <asciitilde> <N> : "\321" Ntilde
<Multi_key> <N> <minus> : "\321" Ntilde
-@@ -299,8 +286,6 @@
+@@ -299,8 +286,6 @@ XCOMM Accented Alphabet
<Multi_key> <minus> <O> : "\325" Otilde
<Multi_key> <O> <quotedbl> : "\326" Odiaeresis
<Multi_key> <quotedbl> <O> : "\326" Odiaeresis
@@ -83,7 +81,7 @@ Index: libx11/nls/iso8859-15/Compose.pre
<Multi_key> <O> <slash> : "\330" Ooblique
<Multi_key> <slash> <O> : "\330" Ooblique
<Multi_key> <O> <E> : "\274" OE
-@@ -320,8 +305,6 @@
+@@ -320,8 +305,6 @@ XCOMM Accented Alphabet
<Multi_key> <minus> <o> : "\365" otilde
<Multi_key> <o> <quotedbl> : "\366" odiaeresis
<Multi_key> <quotedbl> <o> : "\366" odiaeresis
@@ -92,7 +90,7 @@ Index: libx11/nls/iso8859-15/Compose.pre
<Multi_key> <o> <slash> : "\370" oslash
<Multi_key> <slash> <o> : "\370" oslash
<Multi_key> <o> <e> : "\275" oe
-@@ -341,8 +324,6 @@
+@@ -341,8 +324,6 @@ XCOMM Accented Alphabet
<Multi_key> <greater> <U> : "\333" Ucircumflex
<Multi_key> <U> <quotedbl> : "\334" Udiaeresis
<Multi_key> <quotedbl> <U> : "\334" Udiaeresis
@@ -101,7 +99,7 @@ Index: libx11/nls/iso8859-15/Compose.pre
<Multi_key> <u> <grave> : "\371" ugrave
<Multi_key> <grave> <u> : "\371" ugrave
<Multi_key> <u> <acute> : "\372" uacute
-@@ -355,8 +336,6 @@
+@@ -355,8 +336,6 @@ XCOMM Accented Alphabet
<Multi_key> <greater> <u> : "\373" ucircumflex
<Multi_key> <u> <quotedbl> : "\374" udiaeresis
<Multi_key> <quotedbl> <u> : "\374" udiaeresis
@@ -110,7 +108,7 @@ Index: libx11/nls/iso8859-15/Compose.pre
<Multi_key> <s> <s> : "\337" ssharp
<Multi_key> <T> <H> : "\336" THORN
<Multi_key> <t> <h> : "\376" thorn
-@@ -366,16 +345,12 @@
+@@ -366,16 +345,12 @@ XCOMM Accented Alphabet
<Multi_key> <apostrophe> <Y> : "\335" Yacute
<Multi_key> <Y> <quotedbl> : "\276" Ydiaeresis
<Multi_key> <quotedbl> <Y> : "\276" Ydiaeresis
@@ -127,7 +125,7 @@ Index: libx11/nls/iso8859-15/Compose.pre
<Multi_key> <Z> <less> : "\264" Zcaron
<Multi_key> <less> <Z> : "\264" Zcaron
<Multi_key> <z> <less> : "\270" zcaron
-@@ -404,8 +379,7 @@
+@@ -404,8 +379,7 @@ XCOMM These are for us_intl, that does n
<dead_cedilla> <minus> : "\254" notsign
<dead_circumflex> <minus> : "\257" macron
<dead_circumflex> <underscore> : "\257" macron
diff --git a/debian/patches/008_remove_ko_Compose.diff
b/debian/patches/008_remove_ko_Compose.diff
index 59846e5..f714e8b 100644
--- a/debian/patches/008_remove_ko_Compose.diff
+++ b/debian/patches/008_remove_ko_Compose.diff
@@ -1,8 +1,6 @@
-Index: libx11/nls/compose.dir.pre
-===================================================================
---- libx11.orig/nls/compose.dir.pre
-+++ libx11/nls/compose.dir.pre
-@@ -175,7 +175,8 @@
+--- a/nls/compose.dir.pre
++++ b/nls/compose.dir.pre
+@@ -175,7 +175,8 @@ iso8859-1/Compose: kw_GB.ISO8859-1
iso8859-14/Compose: kw_GB.ISO8859-14
iso8859-15/Compose: kw_GB.ISO8859-15
iso8859-10/Compose: lg_UG.ISO8859-10
diff --git a/debian/patches/009_remove_th_Compose.diff
b/debian/patches/009_remove_th_Compose.diff
index 59ac02b..65e82c0 100644
--- a/debian/patches/009_remove_th_Compose.diff
+++ b/debian/patches/009_remove_th_Compose.diff
@@ -1,8 +1,6 @@
-Index: libx11/nls/compose.dir.pre
-===================================================================
---- libx11.orig/nls/compose.dir.pre
-+++ libx11/nls/compose.dir.pre
-@@ -487,7 +487,9 @@
+--- a/nls/compose.dir.pre
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1pmc7r-0003jc...@alioth.debian.org
