ChangeLog | 85 +++++++++++++++++++++
configure | 20 ++--
debian/changelog | 9 +-
debian/patches/006_tailor_pt_BR.UTF-8_Compose.diff | 59 ++++++++++++++
debian/patches/014_add_Khmer_digraphs.diff | 16 ---
debian/patches/series | 1
6 files changed, 160 insertions(+), 30 deletions(-)
New commits:
commit 29a1b44647e6ef6987891bb9476f1b1aa566e1d2
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Sun Sep 14 19:09:38 2008 +0200
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index c21a036..b97dcf0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libx11 (2:1.1.5-1) UNRELEASED; urgency=low
+libx11 (2:1.1.5-1) unstable; urgency=low
[ Brice Goglin ]
* Add upstream URL to debian/copyright.
@@ -13,7 +13,7 @@ libx11 (2:1.1.5-1) UNRELEASED; urgency=low
* 014_add_Khmer_digraphs.diff: remove, applied upstream
* 006_tailor_pt_BR.UTF-8_Compose.diff: update
- -- Timo Aaltonen <[EMAIL PROTECTED]> Fri, 12 Sep 2008 15:49:40 +0300
+ -- Julien Cristau <[EMAIL PROTECTED]> Sun, 14 Sep 2008 19:09:33 +0200
libx11 (2:1.1.4-2) unstable; urgency=low
commit 99adbb9dc2a053db96e3765d96bde185a2628c0c
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Sun Sep 14 19:09:28 2008 +0200
add bug closer
diff --git a/debian/changelog b/debian/changelog
index 2ed9806..c21a036 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ libx11 (2:1.1.5-1) UNRELEASED; urgency=low
[ Timo Aaltonen ]
* New upstream release.
+ + adds missing <cedilla> Compose sequences (closes: #394068)
[ Julien Cristau ]
* 014_add_Khmer_digraphs.diff: remove, applied upstream
commit ce6830153df437186614172e26fddf278a51136f
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Sun Sep 14 19:02:49 2008 +0200
autoreconf
diff --git a/configure b/configure
index fb321f4..7e7332f 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for libX11 1.1.4.
+# Generated by GNU Autoconf 2.61 for libX11 1.1.5.
#
# Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
#
@@ -728,8 +728,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='libX11'
PACKAGE_TARNAME='libX11'
-PACKAGE_VERSION='1.1.4'
-PACKAGE_STRING='libX11 1.1.4'
+PACKAGE_VERSION='1.1.5'
+PACKAGE_STRING='libX11 1.1.5'
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
ac_unique_file="Makefile.am"
@@ -1480,7 +1480,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures libX11 1.1.4 to adapt to many kinds of systems.
+\`configure' configures libX11 1.1.5 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1550,7 +1550,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of libX11 1.1.4:";;
+ short | recursive ) echo "Configuration of libX11 1.1.5:";;
esac
cat <<\_ACEOF
@@ -1694,7 +1694,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-libX11 configure 1.1.4
+libX11 configure 1.1.5
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1708,7 +1708,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by libX11 $as_me 1.1.4, which was
+It was created by libX11 $as_me 1.1.5, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2399,7 +2399,7 @@ fi
# Define the identity of the package.
PACKAGE='libX11'
- VERSION='1.1.4'
+ VERSION='1.1.5'
cat >>confdefs.h <<_ACEOF
@@ -25454,7 +25454,7 @@ exec 6>&1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by libX11 $as_me 1.1.4, which was
+This file was extended by libX11 $as_me 1.1.5, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -25507,7 +25507,7 @@ Report bugs to <[EMAIL PROTECTED]>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-libX11 config.status 1.1.4
+libX11 config.status 1.1.5
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`\\"
commit 8e61995e57985d1b666cb80f3625a6eeec3bfeca
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Sun Sep 14 19:00:31 2008 +0200
update patch stack for 1.1.5
* 014_add_Khmer_digraphs.diff: remove, applied upstream
* 006_tailor_pt_BR.UTF-8_Compose.diff: update
diff --git a/debian/changelog b/debian/changelog
index 9560dae..2ed9806 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,10 @@ libx11 (2:1.1.5-1) UNRELEASED; urgency=low
[ Timo Aaltonen ]
* New upstream release.
+ [ Julien Cristau ]
+ * 014_add_Khmer_digraphs.diff: remove, applied upstream
+ * 006_tailor_pt_BR.UTF-8_Compose.diff: update
+
-- Timo Aaltonen <[EMAIL PROTECTED]> Fri, 12 Sep 2008 15:49:40 +0300
libx11 (2:1.1.4-2) unstable; urgency=low
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 4e1b2fa..95586bf 100644
--- a/debian/patches/006_tailor_pt_BR.UTF-8_Compose.diff
+++ b/debian/patches/006_tailor_pt_BR.UTF-8_Compose.diff
@@ -7,9 +7,11 @@ 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
-@@ -1,5550 +1,3 @@
+@@ -1,5605 +1,3 @@
-XCOMM UTF-8 (Unicode) compose sequence
-XCOMM [EMAIL PROTECTED]
-XCOMM
@@ -481,6 +483,7 @@ Not submitted upstream to X.Org.
-<Multi_key> <o> <A> : "Å" Aring # LATIN CAPITAL LETTER A WITH RING ABOVE
-<dead_cedilla> <C> : "Ç" Ccedilla # LATIN CAPITAL LETTER C WITH CEDILLA
-<Multi_key> <comma> <C> : "Ç" Ccedilla # LATIN CAPITAL LETTER C WITH
CEDILLA
+-<Multi_key> <cedilla> <C> : "Ç" Ccedilla # LATIN CAPITAL LETTER C WITH
CEDILLA
-<dead_grave> <E> : "È" Egrave # LATIN CAPITAL LETTER E WITH GRAVE
-<Multi_key> <grave> <E> : "È" Egrave # LATIN CAPITAL LETTER E WITH GRAVE
-<combining_grave> <E> : "È" Egrave # LATIN CAPITAL LETTER E WITH GRAVE
@@ -555,6 +558,7 @@ Not submitted upstream to X.Org.
-<Multi_key> <o> <a> : "å" aring # LATIN SMALL LETTER A WITH RING ABOVE
-<dead_cedilla> <c> : "ç" ccedilla # LATIN SMALL LETTER C WITH CEDILLA
-<Multi_key> <comma> <c> : "ç" ccedilla # LATIN SMALL LETTER C WITH
CEDILLA
+-<Multi_key> <cedilla> <c> : "ç" ccedilla # LATIN SMALL LETTER C WITH
CEDILLA
-<dead_grave> <e> : "è" egrave # LATIN SMALL LETTER E WITH GRAVE
-<Multi_key> <grave> <e> : "è" egrave # LATIN SMALL LETTER E WITH GRAVE
-<combining_grave> <e> : "è" egrave # LATIN SMALL LETTER E WITH GRAVE
@@ -697,8 +701,10 @@ Not submitted upstream to X.Org.
-<Multi_key> <period> <g> : "ġ" U0121 # LATIN SMALL LETTER G WITH DOT
ABOVE
-<dead_cedilla> <G> : "Ģ" U0122 # LATIN CAPITAL LETTER G WITH CEDILLA
-<Multi_key> <comma> <G> : "Ģ" U0122 # LATIN CAPITAL LETTER G WITH
CEDILLA
+-<Multi_key> <cedilla> <G> : "Ģ" U0122 # LATIN CAPITAL LETTER G WITH
CEDILLA
-<dead_cedilla> <g> : "ģ" U0123 # LATIN SMALL LETTER G WITH CEDILLA
-<Multi_key> <comma> <g> : "ģ" U0123 # LATIN SMALL LETTER G WITH CEDILLA
+-<Multi_key> <cedilla> <g> : "ģ" U0123 # LATIN SMALL LETTER G WITH CEDILLA
-<dead_circumflex> <H> : "Ĥ" U0124 # LATIN CAPITAL LETTER H WITH CIRCUMFLEX
-<Multi_key> <asciicircum> <H> : "Ĥ" U0124 # LATIN CAPITAL LETTER H WITH
CIRCUMFLEX
-<dead_circumflex> <h> : "ĥ" U0125 # LATIN SMALL LETTER H WITH CIRCUMFLEX
@@ -737,8 +743,10 @@ Not submitted upstream to X.Org.
-<Multi_key> <asciicircum> <j> : "ĵ" U0135 # LATIN SMALL LETTER J WITH
CIRCUMFLEX
-<dead_cedilla> <K> : "Ķ" U0136 # LATIN CAPITAL LETTER K WITH CEDILLA
-<Multi_key> <comma> <K> : "Ķ" U0136 # LATIN CAPITAL LETTER K WITH
CEDILLA
+-<Multi_key> <cedilla> <K> : "Ķ" U0136 # LATIN CAPITAL LETTER K WITH
CEDILLA
-<dead_cedilla> <k> : "ķ" U0137 # LATIN SMALL LETTER K WITH CEDILLA
-<Multi_key> <comma> <k> : "ķ" U0137 # LATIN SMALL LETTER K WITH CEDILLA
+-<Multi_key> <cedilla> <k> : "ķ" U0137 # LATIN SMALL LETTER K WITH CEDILLA
-<dead_acute> <L> : "Ĺ" U0139 # LATIN CAPITAL LETTER L WITH ACUTE
-<Multi_key> <acute> <L> : "Ĺ" U0139 # LATIN CAPITAL LETTER L WITH ACUTE
-<Multi_key> <apostrophe> <L> : "Ĺ" U0139 # LATIN CAPITAL LETTER L WITH ACUTE
@@ -749,8 +757,10 @@ Not submitted upstream to X.Org.
-<combining_acute> <l> : "ĺ" U013A # LATIN SMALL LETTER L WITH ACUTE
-<dead_cedilla> <L> : "Ļ" U013B # LATIN CAPITAL LETTER L WITH CEDILLA
-<Multi_key> <comma> <L> : "Ļ" U013B # LATIN CAPITAL LETTER L WITH
CEDILLA
+-<Multi_key> <cedilla> <L> : "Ļ" U013B # LATIN CAPITAL LETTER L WITH
CEDILLA
-<dead_cedilla> <l> : "ļ" U013C # LATIN SMALL LETTER L WITH CEDILLA
-<Multi_key> <comma> <l> : "ļ" U013C # LATIN SMALL LETTER L WITH CEDILLA
+-<Multi_key> <cedilla> <l> : "ļ" U013C # LATIN SMALL LETTER L WITH CEDILLA
-<dead_caron> <L> : "Ľ" U013D # LATIN CAPITAL LETTER L WITH CARON
-<Multi_key> <c> <L> : "Ľ" U013D # LATIN CAPITAL LETTER L WITH CARON
-<dead_caron> <l> : "ľ" U013E # LATIN SMALL LETTER L WITH CARON
@@ -769,8 +779,10 @@ Not submitted upstream to X.Org.
-<combining_acute> <n> : "ń" U0144 # LATIN SMALL LETTER N WITH ACUTE
-<dead_cedilla> <N> : "Ņ" U0145 # LATIN CAPITAL LETTER N WITH CEDILLA
-<Multi_key> <comma> <N> : "Ņ" U0145 # LATIN CAPITAL LETTER N WITH
CEDILLA
+-<Multi_key> <cedilla> <N> : "Ņ" U0145 # LATIN CAPITAL LETTER N WITH
CEDILLA
-<dead_cedilla> <n> : "ņ" U0146 # LATIN SMALL LETTER N WITH CEDILLA
-<Multi_key> <comma> <n> : "ņ" U0146 # LATIN SMALL LETTER N WITH CEDILLA
+-<Multi_key> <cedilla> <n> : "ņ" U0146 # LATIN SMALL LETTER N WITH CEDILLA
-<dead_caron> <N> : "Ň" U0147 # LATIN CAPITAL LETTER N WITH CARON
-<Multi_key> <c> <N> : "Ň" U0147 # LATIN CAPITAL LETTER N WITH CARON
-<dead_caron> <n> : "ň" U0148 # LATIN SMALL LETTER N WITH CARON
@@ -801,8 +813,10 @@ Not submitted upstream to X.Org.
-<combining_acute> <r> : "ŕ" U0155 # LATIN SMALL LETTER R WITH ACUTE
-<dead_cedilla> <R> : "Ŗ" U0156 # LATIN CAPITAL LETTER R WITH CEDILLA
-<Multi_key> <comma> <R> : "Ŗ" U0156 # LATIN CAPITAL LETTER R WITH
CEDILLA
+-<Multi_key> <cedilla> <R> : "Ŗ" U0156 # LATIN CAPITAL LETTER R WITH
CEDILLA
-<dead_cedilla> <r> : "ŗ" U0157 # LATIN SMALL LETTER R WITH CEDILLA
-<Multi_key> <comma> <r> : "ŗ" U0157 # LATIN SMALL LETTER R WITH CEDILLA
+-<Multi_key> <cedilla> <r> : "ŗ" U0157 # LATIN SMALL LETTER R WITH CEDILLA
-<dead_caron> <R> : "Ř" U0158 # LATIN CAPITAL LETTER R WITH CARON
-<Multi_key> <c> <R> : "Ř" U0158 # LATIN CAPITAL LETTER R WITH CARON
-<dead_caron> <r> : "ř" U0159 # LATIN SMALL LETTER R WITH CARON
@@ -821,16 +835,20 @@ Not submitted upstream to X.Org.
-<Multi_key> <asciicircum> <s> : "ŝ" U015D # LATIN SMALL LETTER S WITH
CIRCUMFLEX
-<dead_cedilla> <S> : "Ş" U015E # LATIN CAPITAL LETTER S WITH CEDILLA
-<Multi_key> <comma> <S> : "Ş" U015E # LATIN CAPITAL LETTER S WITH
CEDILLA
+-<Multi_key> <cedilla> <S> : "Ş" U015E # LATIN CAPITAL LETTER S WITH
CEDILLA
-<dead_cedilla> <s> : "ş" U015F # LATIN SMALL LETTER S WITH CEDILLA
-<Multi_key> <comma> <s> : "ş" U015F # LATIN SMALL LETTER S WITH CEDILLA
+-<Multi_key> <cedilla> <s> : "ş" U015F # LATIN SMALL LETTER S WITH CEDILLA
-<dead_caron> <S> : "Š" U0160 # LATIN CAPITAL LETTER S WITH CARON
-<Multi_key> <c> <S> : "Š" U0160 # LATIN CAPITAL LETTER S WITH CARON
-<dead_caron> <s> : "š" U0161 # LATIN SMALL LETTER S WITH CARON
-<Multi_key> <c> <s> : "š" U0161 # LATIN SMALL LETTER S WITH CARON
-<dead_cedilla> <T> : "Ţ" U0162 # LATIN CAPITAL LETTER T WITH CEDILLA
-<Multi_key> <comma> <T> : "Ţ" U0162 # LATIN CAPITAL LETTER T WITH
CEDILLA
+-<Multi_key> <cedilla> <T> : "Ţ" U0162 # LATIN CAPITAL LETTER T WITH
CEDILLA
-<dead_cedilla> <t> : "ţ" U0163 # LATIN SMALL LETTER T WITH CEDILLA
-<Multi_key> <comma> <t> : "ţ" U0163 # LATIN SMALL LETTER T WITH CEDILLA
+-<Multi_key> <cedilla> <t> : "ţ" U0163 # LATIN SMALL LETTER T WITH CEDILLA
-<dead_caron> <T> : "Ť" U0164 # LATIN CAPITAL LETTER T WITH CARON
-<Multi_key> <c> <T> : "Ť" U0164 # LATIN CAPITAL LETTER T WITH CARON
-<dead_caron> <t> : "ť" U0165 # LATIN SMALL LETTER T WITH CARON
@@ -1189,8 +1207,10 @@ Not submitted upstream to X.Org.
-<Multi_key> <period> <a> : "ȧ" U0227 # LATIN SMALL LETTER A WITH DOT
ABOVE
-<dead_cedilla> <E> : "Ȩ" U0228 # LATIN CAPITAL LETTER E WITH CEDILLA
-<Multi_key> <comma> <E> : "Ȩ" U0228 # LATIN CAPITAL LETTER E WITH
CEDILLA
+-<Multi_key> <cedilla> <E> : "Ȩ" U0228 # LATIN CAPITAL LETTER E WITH
CEDILLA
-<dead_cedilla> <e> : "ȩ" U0229 # LATIN SMALL LETTER E WITH CEDILLA
-<Multi_key> <comma> <e> : "ȩ" U0229 # LATIN SMALL LETTER E WITH CEDILLA
+-<Multi_key> <cedilla> <e> : "ȩ" U0229 # LATIN SMALL LETTER E WITH CEDILLA
-<dead_macron> <Odiaeresis> : "Ȫ" U022A # LATIN CAPITAL LETTER O WITH
DIAERESIS AND MACRON
-<Multi_key> <macron> <Odiaeresis> : "Ȫ" U022A # LATIN CAPITAL LETTER O
WITH DIAERESIS AND MACRON
-<Multi_key> <underscore> <Odiaeresis> : "Ȫ" U022A # LATIN CAPITAL LETTER O
WITH DIAERESIS AND MACRON
@@ -1653,25 +1673,33 @@ Not submitted upstream to X.Org.
-<Multi_key> <apostrophe> <Ccedilla> : "Ḉ" U1E08 # LATIN CAPITAL LETTER C
WITH CEDILLA AND ACUTE
-<dead_acute> <dead_cedilla> <C> : "Ḉ" U1E08 # LATIN CAPITAL LETTER C
WITH CEDILLA AND ACUTE
-<dead_acute> <Multi_key> <comma> <C> : "Ḉ" U1E08 # LATIN CAPITAL LETTER C
WITH CEDILLA AND ACUTE
+-<dead_acute> <Multi_key> <cedilla> <C> : "Ḉ" U1E08 # LATIN CAPITAL
LETTER C WITH CEDILLA AND ACUTE
-<Multi_key> <acute> <dead_cedilla> <C> : "Ḉ" U1E08 # LATIN CAPITAL
LETTER C WITH CEDILLA AND ACUTE
-<Multi_key> <acute> <comma> <C> : "Ḉ" U1E08 # LATIN CAPITAL LETTER C
WITH CEDILLA AND ACUTE
+-<Multi_key> <acute> <cedilla> <C> : "Ḉ" U1E08 # LATIN CAPITAL LETTER C
WITH CEDILLA AND ACUTE
-<Multi_key> <apostrophe> <dead_cedilla> <C> : "Ḉ" U1E08 # LATIN CAPITAL
LETTER C WITH CEDILLA AND ACUTE
-<Multi_key> <apostrophe> <comma> <C> : "Ḉ" U1E08 # LATIN CAPITAL LETTER C
WITH CEDILLA AND ACUTE
+-<Multi_key> <apostrophe> <cedilla> <C> : "Ḉ" U1E08 # LATIN CAPITAL
LETTER C WITH CEDILLA AND ACUTE
-<combining_acute> <Ccedilla> : "Ḉ" U1E08 # LATIN CAPITAL LETTER C WITH
CEDILLA AND ACUTE
-<combining_acute> <dead_cedilla> <C> : "Ḉ" U1E08 # LATIN CAPITAL LETTER C
WITH CEDILLA AND ACUTE
-<combining_acute> <Multi_key> <comma> <C> : "Ḉ" U1E08 # LATIN CAPITAL
LETTER C WITH CEDILLA AND ACUTE
+-<combining_acute> <Multi_key> <cedilla> <C> : "Ḉ" U1E08 # LATIN CAPITAL
LETTER C WITH CEDILLA AND ACUTE
-<dead_acute> <ccedilla> : "ḉ" U1E09 # LATIN SMALL LETTER C WITH CEDILLA
AND ACUTE
-<Multi_key> <acute> <ccedilla> : "ḉ" U1E09 # LATIN SMALL LETTER C WITH
CEDILLA AND ACUTE
-<Multi_key> <apostrophe> <ccedilla> : "ḉ" U1E09 # LATIN SMALL LETTER C WITH
CEDILLA AND ACUTE
-<dead_acute> <dead_cedilla> <c> : "ḉ" U1E09 # LATIN SMALL LETTER C WITH
CEDILLA AND ACUTE
-<dead_acute> <Multi_key> <comma> <c> : "ḉ" U1E09 # LATIN SMALL LETTER C WITH
CEDILLA AND ACUTE
+-<dead_acute> <Multi_key> <cedilla> <c> : "ḉ" U1E09 # LATIN SMALL
LETTER C WITH CEDILLA AND ACUTE
-<Multi_key> <acute> <dead_cedilla> <c> : "ḉ" U1E09 # LATIN SMALL
LETTER C WITH CEDILLA AND ACUTE
-<Multi_key> <acute> <comma> <c> : "ḉ" U1E09 # LATIN SMALL LETTER C WITH
CEDILLA AND ACUTE
+-<Multi_key> <acute> <cedilla> <c> : "ḉ" U1E09 # LATIN SMALL LETTER C WITH
CEDILLA AND ACUTE
-<Multi_key> <apostrophe> <dead_cedilla> <c> : "ḉ" U1E09 # LATIN SMALL
LETTER C WITH CEDILLA AND ACUTE
-<Multi_key> <apostrophe> <comma> <c> : "ḉ" U1E09 # LATIN SMALL LETTER C WITH
CEDILLA AND ACUTE
+-<Multi_key> <apostrophe> <cedilla> <c> : "ḉ" U1E09 # LATIN SMALL
LETTER C WITH CEDILLA AND ACUTE
-<combining_acute> <ccedilla> : "ḉ" U1E09 # LATIN SMALL LETTER C WITH CEDILLA
AND ACUTE
-<combining_acute> <dead_cedilla> <c> : "ḉ" U1E09 # LATIN SMALL LETTER C WITH
CEDILLA AND ACUTE
-<combining_acute> <Multi_key> <comma> <c> : "ḉ" U1E09 # LATIN SMALL
LETTER C WITH CEDILLA AND ACUTE
+-<combining_acute> <Multi_key> <cedilla> <c> : "ḉ" U1E09 # LATIN SMALL
LETTER C WITH CEDILLA AND ACUTE
-<dead_abovedot> <D> : "Ḋ" U1E0A # LATIN CAPITAL LETTER D WITH DOT ABOVE
-<Multi_key> <period> <D> : "Ḋ" U1E0A # LATIN CAPITAL LETTER D WITH DOT
ABOVE
-<dead_abovedot> <d> : "ḋ" U1E0B # LATIN SMALL LETTER D WITH DOT ABOVE
@@ -1686,8 +1714,10 @@ Not submitted upstream to X.Org.
-<U0331> <d> : "ḏ" U1E0F # LATIN SMALL LETTER D WITH LINE BELOW
-<dead_cedilla> <D> : "Ḑ" U1E10 # LATIN CAPITAL LETTER D WITH CEDILLA
-<Multi_key> <comma> <D> : "Ḑ" U1E10 # LATIN CAPITAL LETTER D WITH
CEDILLA
+-<Multi_key> <cedilla> <D> : "Ḑ" U1E10 # LATIN CAPITAL LETTER D WITH
CEDILLA
-<dead_cedilla> <d> : "ḑ" U1E11 # LATIN SMALL LETTER D WITH CEDILLA
-<Multi_key> <comma> <d> : "ḑ" U1E11 # LATIN SMALL LETTER D WITH CEDILLA
+-<Multi_key> <cedilla> <d> : "ḑ" U1E11 # LATIN SMALL LETTER D WITH CEDILLA
-<U032d> <D> : "Ḓ" U1E12 # LATIN CAPITAL LETTER D WITH CIRCUMFLEX BELOW
-<U032d> <d> : "ḓ" U1E13 # LATIN SMALL LETTER D WITH CIRCUMFLEX BELOW
-<dead_grave> <Emacron> : "Ḕ" U1E14 # LATIN CAPITAL LETTER E WITH
MACRON AND GRAVE
@@ -1755,19 +1785,25 @@ Not submitted upstream to X.Org.
-<Multi_key> <b> <U0228> : "Ḝ" U1E1C # LATIN CAPITAL LETTER E WITH
CEDILLA AND BREVE
-<dead_breve> <dead_cedilla> <E> : "Ḝ" U1E1C # LATIN CAPITAL LETTER E
WITH CEDILLA AND BREVE
-<dead_breve> <Multi_key> <comma> <E> : "Ḝ" U1E1C # LATIN CAPITAL LETTER E
WITH CEDILLA AND BREVE
+-<dead_breve> <Multi_key> <cedilla> <E> : "Ḝ" U1E1C # LATIN CAPITAL
LETTER E WITH CEDILLA AND BREVE
-<Multi_key> <U> <dead_cedilla> <E> : "Ḝ" U1E1C # LATIN CAPITAL LETTER E
WITH CEDILLA AND BREVE
-<Multi_key> <U> <comma> <E> : "Ḝ" U1E1C # LATIN CAPITAL LETTER E WITH
CEDILLA AND BREVE
+-<Multi_key> <U> <cedilla> <E> : "Ḝ" U1E1C # LATIN CAPITAL LETTER E WITH
CEDILLA AND BREVE
-<Multi_key> <b> <dead_cedilla> <E> : "Ḝ" U1E1C # LATIN CAPITAL LETTER E
WITH CEDILLA AND BREVE
-<Multi_key> <b> <comma> <E> : "Ḝ" U1E1C # LATIN CAPITAL LETTER E WITH
CEDILLA AND BREVE
+-<Multi_key> <b> <cedilla> <E> : "Ḝ" U1E1C # LATIN CAPITAL LETTER E WITH
CEDILLA AND BREVE
-<dead_breve> <U0229> : "ḝ" U1E1D # LATIN SMALL LETTER E WITH CEDILLA AND
BREVE
-<Multi_key> <U> <U0229> : "ḝ" U1E1D # LATIN SMALL LETTER E WITH CEDILLA
AND BREVE
-<Multi_key> <b> <U0229> : "ḝ" U1E1D # LATIN SMALL LETTER E WITH CEDILLA
AND BREVE
-<dead_breve> <dead_cedilla> <e> : "ḝ" U1E1D # LATIN SMALL LETTER E WITH
CEDILLA AND BREVE
-<dead_breve> <Multi_key> <comma> <e> : "ḝ" U1E1D # LATIN SMALL LETTER E WITH
CEDILLA AND BREVE
+-<dead_breve> <Multi_key> <cedilla> <e> : "ḝ" U1E1D # LATIN SMALL
LETTER E WITH CEDILLA AND BREVE
-<Multi_key> <U> <dead_cedilla> <e> : "ḝ" U1E1D # LATIN SMALL LETTER E WITH
CEDILLA AND BREVE
-<Multi_key> <U> <comma> <e> : "ḝ" U1E1D # LATIN SMALL LETTER E WITH CEDILLA
AND BREVE
+-<Multi_key> <U> <cedilla> <e> : "ḝ" U1E1D # LATIN SMALL LETTER E WITH CEDILLA
AND BREVE
-<Multi_key> <b> <dead_cedilla> <e> : "ḝ" U1E1D # LATIN SMALL LETTER E WITH
CEDILLA AND BREVE
-<Multi_key> <b> <comma> <e> : "ḝ" U1E1D # LATIN SMALL LETTER E WITH CEDILLA
AND BREVE
+-<Multi_key> <b> <cedilla> <e> : "ḝ" U1E1D # LATIN SMALL LETTER E WITH CEDILLA
AND BREVE
-<dead_abovedot> <F> : "Ḟ" U1E1E # LATIN CAPITAL LETTER F WITH DOT ABOVE
-<Multi_key> <period> <F> : "Ḟ" U1E1E # LATIN CAPITAL LETTER F WITH DOT
ABOVE
-<dead_abovedot> <f> : "ḟ" U1E1F # LATIN SMALL LETTER F WITH DOT ABOVE
@@ -1794,8 +1830,10 @@ Not submitted upstream to X.Org.
-<Multi_key> <quotedbl> <h> : "ḧ" U1E27 # LATIN SMALL LETTER H WITH
DIAERESIS
-<dead_cedilla> <H> : "Ḩ" U1E28 # LATIN CAPITAL LETTER H WITH CEDILLA
-<Multi_key> <comma> <H> : "Ḩ" U1E28 # LATIN CAPITAL LETTER H WITH
CEDILLA
+-<Multi_key> <cedilla> <H> : "Ḩ" U1E28 # LATIN CAPITAL LETTER H WITH
CEDILLA
-<dead_cedilla> <h> : "ḩ" U1E29 # LATIN SMALL LETTER H WITH CEDILLA
-<Multi_key> <comma> <h> : "ḩ" U1E29 # LATIN SMALL LETTER H WITH CEDILLA
+-<Multi_key> <cedilla> <h> : "ḩ" U1E29 # LATIN SMALL LETTER H WITH CEDILLA
-<U032e> <H> : "Ḫ" U1E2A # LATIN CAPITAL LETTER H WITH BREVE BELOW
-<U032e> <h> : "ḫ" U1E2B # LATIN SMALL LETTER H WITH BREVE BELOW
-<U0330> <I> : "Ḭ" U1E2C # LATIN CAPITAL LETTER I WITH TILDE BELOW
@@ -5560,6 +5598,25 @@ Not submitted upstream to X.Org.
-<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
+-XCOMM Khmer digraphs
+-XCOMM
+-
+-<U17ff> : "ាំ"
+-<U17fe> : "ោះ"
+-<U17fd> : "េះ"
+-<U17fc> : "ុំ"
+-<U17fb> : "ុះ"
+-
+-XCOMM
+-XCOMM Arabic Lam-Alef ligatures
+-XCOMM
+-
+-<UFEFB> : "لا" # ARABIC LIGATURE LAM WITH ALEF
+-<UFEF7> : "لأ" # ARABIC LIGATURE LAM WITH ALEF WITH HAMZA ABOVE
+-<UFEF9> : "لإ" # ARABIC LIGATURE LAM WITH ALEF WITH HAMZA BELOW
+-<UFEF5> : "لآ" # ARABIC LIGATURE LAM WITH ALEF WITH MADDA ABOVE
+include "/usr/share/X11/locale/en_US.UTF-8/Compose"
+<dead_acute> <C> : "Ç" Ccedilla # LATIN CAPITAL LETTER C WITH CEDILLA
+<dead_acute> <c> : "ç" ccedilla # LATIN SMALL LETTER C WITH CEDILLA
diff --git a/debian/patches/014_add_Khmer_digraphs.diff
b/debian/patches/014_add_Khmer_digraphs.diff
deleted file mode 100644
index 79a2133..0000000
--- a/debian/patches/014_add_Khmer_digraphs.diff
+++ /dev/null
@@ -1,16 +0,0 @@
---- libx11.orig/nls/en_US.UTF-8/Compose.pre
-+++ libx11/nls/en_US.UTF-8/Compose.pre
-@@ -6228,3 +6228,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> : "ាំ"
diff --git a/debian/patches/series b/debian/patches/series
index ffcf9fd..9a4fc2a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,5 +4,4 @@
007_iso8859-15_Compose_fix.diff
008_remove_ko_Compose.diff
012_ru_RU_UTF-8_XLC_LOCALE.diff
-014_add_Khmer_digraphs.diff
015_russian_locale_alias.diff
commit 45f9920f460298f14143f43a161b3895e7d6bcba
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Sun Sep 14 18:50:42 2008 +0200
Update ChangeLog
diff --git a/ChangeLog b/ChangeLog
index c6fd235..e36c0aa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,88 @@
+commit 5b7f3b98079ab730b037b33893521dbaa61f5234
+Author: Daniel Stone <[EMAIL PROTECTED]>
+Date: Fri Sep 5 00:39:01 2008 +0300
+
+ Update to 1.1.5
+
+ Small bugfix and i18n-improvement release.
+
+commit 8c1dfc976a29f981f601503b9768d3414a70ba50
+Author: James Cloos <[EMAIL PROTECTED]>
+Date: Thu Jul 17 21:01:42 2008 -0400
+
+ Add more <Multi_key> <cedilla> Compose tuples
+
+ The last commit missed the el_GR UTF-8 Compose.pre as well as
+ the various ISO 8859 locales which have compose sequences
+ generating ‘WITH CEDILLA’ characters.
+
+ (Interestingly, some of the 8859 locales already supported
+ <Multi_key> <cedilla> for some CEDILLA characters, but not
+ for Ç or ç.)
+
+ This is further work on bug 10397.
+ (cherry picked from commit 55248e5c84c3fd8c349a3bb4cb15a1ec86989d74)
+
+commit b11ea7ab3a436745e5244599048516600e47ab5d
+Author: James Cloos <[EMAIL PROTECTED]>
+Date: Thu Jul 17 17:16:50 2008 -0400
+
+ Work on making the en_US and pt_BR UTF-8 Compose as similar as possible.
+
+ The eventual goal here is to have a single primary UTF-8 Compose
+ file which the locale-specific UTF-8 Compose.pre files can #include.
+ (cherry picked from commit 4ba091255bb953d53078ba5619d6751052c739f7)
+
+commit 04828f15866aa7cf43a03b399ac12a393f14f4f7
+Author: James Cloos <[EMAIL PROTECTED]>
+Date: Thu Jul 17 17:13:36 2008 -0400
+
+ Add <Multi_key> <cedilla> Compose tuples
+
+ The en_US and pt_BR UTF-8 Compose tables had support for using <comma>
+ with <Multi_key> to enter CEDILLA characters. Bug 10397 requests
+ support for using <cedilla> instead of <comma> in said sequences.
+
+ This commit makes both styles work.
+ (cherry picked from commit 254522d3c24e0590732fc03cdd61ff4564819d94)
+
+commit 685933616eb0d80644d26f092fd0a82339fe23da
+Author: James Cloos <[EMAIL PROTECTED]>
+Date: Sat Jun 28 15:25:23 2008 -0400
+
+ Fix commit 21e464ec682ab23ba20ddf6bd72c6db214cfbe01
+
+ The new block was added twice to the en_US.UTF-8 Compose.pre;
+ delete the duplicate.
+ (cherry picked from commit 7dc907f6032e1d5cbe4da0e414bdf2c569c04b44)
+
+commit 692f6ecc691e83c2601b90e32b1dc395e9dbe8c6
+Author: Khaled Hosny <[EMAIL PROTECTED]>
+Date: Thu Jun 19 18:26:11 2008 -0400
+
+ NLS: Add Arabic Lam-Alef ligature compose sequences (bug #16426)
+
+ Add some Arabic digraphs to utf-8 locales with a Compose.pre
+
+ Signed-off-by: James Cloos <[EMAIL PROTECTED]>
+ (cherry picked from commit 21e464ec682ab23ba20ddf6bd72c6db214cfbe01)
+
+commit 9b2ab1130e273f6e25cb58d5a2aa7a87e909759e
+Author: Jens Herden <[EMAIL PROTECTED]>
+Date: Tue Jun 10 20:07:30 2008 +0300
+
+ NLS: Add Khmer compose sequences (bug #5706)
+
+ Add some Khmer digraphs to all locales with a Compose.pre.
+ (cherry picked from commit fca0b0ba3f72b7284601d4690bba99fc80a92614)
+
+commit 30f37e249d148c5dd557f114c9b44616a0b12b32
+Author: Daniel Stone <[EMAIL PROTECTED]>
+Date: Mon May 19 19:22:31 2008 +0300
+
+ gitignore: Update with loads more bits from server
+ (cherry picked from commit 19802ccd3909145e3ba2f6c073271cb5f3701685)
+
commit a7f85567a3e850fba0c44571453d2852ab1a09be
Author: Adam Jackson <[EMAIL PROTECTED]>
Date: Tue May 13 10:28:39 2008 -0400
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
