[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

libx11: Changes to 'debian-unstable'



 ChangeLog                                                  |  263 ++
 configure.ac                                               |   17 
 debian/README.source                                       |   73 
 debian/changelog                                           |   11 
 debian/control                                             |    2 
 debian/patches/002_arm_abi_brain_damage.diff               |    6 
 debian/patches/003_recognize_glibc_2.3.2_locale_names.diff |  131 -
 debian/patches/006_tailor_pt_BR.UTF-8_Compose.diff         | 1501 ------------
 debian/patches/007_iso8859-15_Compose_fix.diff             |    4 
 debian/patches/008_remove_ko_Compose.diff                  |    4 
 debian/patches/009_remove_th_Compose.diff                  |    8 
 debian/patches/015_russian_locale_alias.diff               |    6 
 debian/xsfbs/xsfbs.sh                                      |   12 
 include/X11/Xlib.h                                         |   21 
 man/XAllocColor.man                                        |    2 
 man/xkb/XkbGetKeyboard.man                                 |    2 
 modules/im/ximcp/imThaiFlt.c                               |   50 
 modules/om/generic/omGeneric.c                             |    2 
 nls/compose.dir.pre                                        |   17 
 nls/el_GR.UTF-8/Compose.pre                                |  441 ---
 nls/en_US.UTF-8/Compose.pre                                | 1607 -------------
 nls/fi_FI.UTF-8/Compose.pre                                | 1607 -------------
 nls/iso8859-1/Compose.pre                                  |   16 
 nls/iso8859-15/Compose.pre                                 |    8 
 nls/iso8859-9/Compose.pre                                  |    8 
 nls/iso8859-9e/Compose.pre                                 |    8 
 nls/locale.alias.pre                                       |   39 
 nls/locale.dir.pre                                         |   15 
 nls/pt_BR.UTF-8/Compose.pre                                | 1495 ------------
 nls/th_TH.UTF-8/XLC_LOCALE.pre                             |   12 
 nls/th_TH/XLC_LOCALE.pre                                   |    6 
 src/ChkMaskEv.c                                            |    2 
 src/ChkWinEv.c                                             |    2 
 src/MaskEvent.c                                            |    2 
 src/WinEvent.c                                             |    2 
 src/XlibInt.c                                              |    2 
 36 files changed, 803 insertions(+), 6601 deletions(-)

New commits:
commit c2eb083c940a80c625b651c24c263ebc84c52142
Author: Brice Goglin <bgoglin@debian.org>
Date:   Sun Jul 19 19:21:20 2009 +0200

    Prepare changelog for upload

diff --git a/debian/changelog b/debian/changelog
index ede4022..a37c799 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libx11 (2:1.2.2-1) UNRELEASED; urgency=low
+libx11 (2:1.2.2-1) unstable; urgency=low
 
   [ Julien Cristau ]
   * Move dbg packages to new debug section.
@@ -11,7 +11,7 @@ libx11 (2:1.2.2-1) UNRELEASED; urgency=low
     + Fix thai XIM filtering keys when NumLock/CapsLock is on, closes: #443800.
   * Add myself to Uploaders.
 
- -- Brice Goglin <bgoglin@debian.org>  Sun, 19 Jul 2009 19:20:22 +0200
+ -- Brice Goglin <bgoglin@debian.org>  Sun, 19 Jul 2009 19:21:16 +0200
 
 libx11 (2:1.2.1-1) unstable; urgency=low
 

commit 73eeda738a13aebf93773dca7570e9ad1d14bd6f
Author: Brice Goglin <bgoglin@debian.org>
Date:   Sun Jul 19 19:20:39 2009 +0200

    Add myself to Uploaders

diff --git a/debian/changelog b/debian/changelog
index c82d561..ede4022 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,8 +9,9 @@ libx11 (2:1.2.2-1) UNRELEASED; urgency=low
   * New upstream release.
     + Fix fi_FI.UTF-8, closes: #519474.
     + Fix thai XIM filtering keys when NumLock/CapsLock is on, closes: #443800.
+  * Add myself to Uploaders.
 
- -- Brice Goglin <bgoglin@debian.org>  Sun, 19 Jul 2009 19:19:30 +0200
+ -- Brice Goglin <bgoglin@debian.org>  Sun, 19 Jul 2009 19:20:22 +0200
 
 libx11 (2:1.2.1-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index a4abaff..0393fa1 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: libx11
 Section: x11
 Priority: optional
 Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-Uploaders: David Nusinow <dnusinow@debian.org>, Josh Triplett <josh@freedesktop.org>, Jamey Sharp <sharpone@debian.org>, Julien Cristau <jcristau@debian.org>
+Uploaders: David Nusinow <dnusinow@debian.org>, Josh Triplett <josh@freedesktop.org>, Jamey Sharp <sharpone@debian.org>, Julien Cristau <jcristau@debian.org>, Brice Goglin <bgoglin@debian.org>
 Build-Depends:
  debhelper (>= 5.0.0),
  pkg-config,

commit 25d3aae8fa6059c9dd9d3858d4aa71b335e3eb79
Author: Brice Goglin <bgoglin@debian.org>
Date:   Sun Jul 19 20:38:04 2009 +0200

    Update patches

diff --git a/debian/patches/002_arm_abi_brain_damage.diff b/debian/patches/002_arm_abi_brain_damage.diff
index d39c4e5..cc62ac3 100644
--- a/debian/patches/002_arm_abi_brain_damage.diff
+++ b/debian/patches/002_arm_abi_brain_damage.diff
@@ -10,9 +10,9 @@ Not submitted upstream to XFree86 or X.Org.
 
 Index: libx11/include/X11/Xlib.h
 ===================================================================
---- libx11.orig/include/X11/Xlib.h
-+++ libx11/include/X11/Xlib.h
-@@ -1083,7 +1083,12 @@
+--- libx11.orig/include/X11/Xlib.h	2009-07-19 20:36:43.000000000 +0200
++++ libx11/include/X11/Xlib.h	2009-07-19 20:36:47.000000000 +0200
+@@ -1062,7 +1062,12 @@
  typedef struct {		/* normal 16 bit characters are two bytes */
      unsigned char byte1;
      unsigned char byte2;
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 7f592a9..ab51f15 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
@@ -57,8 +57,8 @@ but any bit would help.  --Nathanael
 
 Index: libx11/nls/compose.dir.pre
 ===================================================================
---- libx11.orig/nls/compose.dir.pre
-+++ libx11/nls/compose.dir.pre
+--- libx11.orig/nls/compose.dir.pre	2009-07-19 20:36:43.000000000 +0200
++++ libx11/nls/compose.dir.pre	2009-07-19 20:37:07.000000000 +0200
 @@ -1,14 +1,22 @@
  XCOMM $Xorg: compose.dir,v 1.3 2000/08/17 19:46:48 cpqbld Exp $
  XCOMM
@@ -238,7 +238,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
-@@ -212,38 +253,57 @@
+@@ -212,35 +253,53 @@
  iso8859-15/Compose:		sv_SE.ISO8859-15
  tscii-0/Compose:		ta_IN.TSCII-0
  koi8-c/Compose:			tg_TJ.KOI8-C
@@ -298,11 +298,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
-+en_US.UTF-8/Compose:       ar_IN.UTF-8
- en_US.UTF-8/Compose:		ar_IQ.UTF-8
- en_US.UTF-8/Compose:		ar_JO.UTF-8
- en_US.UTF-8/Compose:		ar_KW.UTF-8
-@@ -253,15 +313,18 @@
+@@ -254,16 +313,19 @@
  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
@@ -310,6 +306,7 @@ Index: libx11/nls/compose.dir.pre
 +en_US.UTF-8/Compose:       ar_SY.UTF-8
  en_US.UTF-8/Compose:		ar_TN.UTF-8
  en_US.UTF-8/Compose:		ar_YE.UTF-8
+ en_US.UTF-8/Compose:		bo_IN.UTF-8
  en_US.UTF-8/Compose:		bs_BA.UTF-8
  en_US.UTF-8/Compose:		az_AZ.UTF-8
 -en_US.UTF-8/Compose:		a3_AZ.UTF-8
@@ -322,7 +319,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 +342,25 @@
+@@ -281,17 +343,25 @@
  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
@@ -348,7 +345,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 +384,7 @@
+@@ -315,6 +385,7 @@
  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
@@ -356,7 +353,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 +395,8 @@
+@@ -325,6 +396,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
@@ -365,7 +362,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
-@@ -336,10 +410,13 @@
+@@ -339,10 +412,12 @@
  en_US.UTF-8/Compose:		it_CH.UTF-8
  en_US.UTF-8/Compose:		it_IT.UTF-8
  en_US.UTF-8/Compose:		iu_CA.UTF-8
@@ -375,24 +372,22 @@ Index: libx11/nls/compose.dir.pre
  en_US.UTF-8/Compose:		kl_GL.UTF-8
  en_US.UTF-8/Compose:		kk_KZ.UTF-8
 +en_US.UTF-8/Compose:		km_KH.UTF-8
-+en_US.UTF-8/Compose:       kn_IN.UTF-8
+ en_US.UTF-8/Compose:		kn_IN.UTF-8
  en_US.UTF-8/Compose:		ko_KR.UTF-8
- en_US.UTF-8/Compose:		kw_GB.UTF-8
- en_US.UTF-8/Compose:		ky_KG.UTF-8
-@@ -348,8 +425,12 @@
- en_US.UTF-8/Compose:		lv_LV.UTF-8
+ en_US.UTF-8/Compose:		ks_IN.UTF-8
+@@ -356,9 +431,11 @@
  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
+ en_US.UTF-8/Compose:		ml_IN.UTF-8
 +en_US.UTF-8/Compose:       mn_MN.UTF-8
-+en_US.UTF-8/Compose:       mr_IN.UTF-8
+ 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
 +en_US.UTF-8/Compose:       ne_NP.UTF-8
  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
-@@ -357,11 +438,17 @@
+@@ -366,13 +443,19 @@
  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
@@ -401,8 +396,10 @@ Index: libx11/nls/compose.dir.pre
 +XCOMM See <URL: http://www.ethnologue.com/show_iso639.asp?code=nya >.
 +XCOMM en_US.UTF-8/Compose: ny_NO.UTF-8
  en_US.UTF-8/Compose:		oc_FR.UTF-8
+ en_US.UTF-8/Compose:		or_IN.UTF-8
 +en_US.UTF-8/Compose:       om_ET.UTF-8
  en_US.UTF-8/Compose:		pa_IN.UTF-8
+ en_US.UTF-8/Compose:		pa_PK.UTF-8
 -en_US.UTF-8/Compose:		pd_DE.UTF-8
 -en_US.UTF-8/Compose:		pd_US.UTF-8
 +XCOMM Presumably, "pd" is "Pennsylvania 'Dutch'", a U.S. dialect of German.
@@ -413,10 +410,10 @@ 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
-@@ -371,10 +458,14 @@
- en_US.UTF-8/Compose:		ru_RU.UTF-8
- en_US.UTF-8/Compose:		ru_UA.UTF-8
- en_US.UTF-8/Compose:		rw_RW.UTF-8
+@@ -385,10 +468,14 @@
+ en_US.UTF-8/Compose:		sa_IN.UTF-8
+ en_US.UTF-8/Compose:		sd_IN.UTF-8
+ en_US.UTF-8/Compose:		sd_IN@devanagari.UTF-8
 +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
@@ -428,11 +425,8 @@ 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
-@@ -385,8 +476,12 @@
- en_US.UTF-8/Compose:		sv_FI.UTF-8
- en_US.UTF-8/Compose:		sv_SE.UTF-8
- en_US.UTF-8/Compose:		ta_IN.UTF-8
-+en_US.UTF-8/Compose:       te_IN.UTF-8
+@@ -402,6 +489,9 @@
+ 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
 +en_US.UTF-8/Compose:       ti_ER.UTF-8
@@ -443,9 +437,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
-+++ libx11/nls/locale.alias.pre
-@@ -306,6 +306,12 @@
+--- libx11.orig/nls/locale.alias.pre	2009-07-19 20:36:43.000000000 +0200
++++ libx11/nls/locale.alias.pre	2009-07-19 20:37:00.000000000 +0200
+@@ -309,6 +309,12 @@
  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
@@ -458,15 +452,24 @@ 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
-@@ -359,6 +365,7 @@
- en_US.ISO-8859-1:				en_US.ISO8859-1
- en_US.ISO_8859-1:				en_US.ISO8859-1
- en_US.iso885915:				en_US.ISO8859-15
-+en_US.ISO-8859-15:				en_US.ISO8859-15
- en_US.8859-15:					en_US.ISO8859-15
+@@ -357,6 +363,16 @@
  en_US.ISO8859-15@euro:				en_US.ISO8859-15
  en_US.utf8:					en_US.UTF-8
-@@ -733,6 +740,10 @@
+ EN_US.UTF-8:					en_US.UTF-8
++en_US.88591.en:				en_US.ISO8859-1
++en_US.iso88591:				en_US.ISO8859-1
++en_US.ISO-8859-1:				en_US.ISO8859-1
++en_US.ISO_8859-1:				en_US.ISO8859-1
++en_US.iso885915:				en_US.ISO8859-15
++en_US.ISO-8859-15:				en_US.ISO8859-15
++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
+ en_ZA:						en_ZA.ISO8859-1
+ en_ZA.88591:					en_ZA.ISO8859-1
+ en_ZA.88591.en:					en_ZA.ISO8859-1
+@@ -728,6 +744,10 @@
  kl_GL.ISO-8859-1:				kl_GL.ISO8859-1
  kl_GL.iso885915:				kl_GL.ISO8859-15
  kl_GL.utf8:					kl_GL.UTF-8
@@ -477,7 +480,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
-@@ -916,7 +927,6 @@
+@@ -926,7 +946,6 @@
  pt_BR.iso88591:					pt_BR.ISO8859-1
  pt_BR.ISO-8859-1:				pt_BR.ISO8859-1
  pt_BR.ISO_8859-1:				pt_BR.ISO8859-1
@@ -485,7 +488,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
-@@ -972,11 +982,11 @@
+@@ -987,11 +1006,11 @@
  XCOMM These lines should be deleted in the future.
  sh:						sr_RS.UTF-8@latin
  sh_BA.ISO8859-2@bosnia:				sr_CS.ISO8859-2
@@ -498,7 +501,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
-@@ -1185,7 +1195,7 @@
+@@ -1200,7 +1219,7 @@
  american.iso88591:				en_US.ISO8859-1
  arabic.iso88596:				ar_AA.ISO8859-6
  bokmal:						nb_NO.ISO8859-1
@@ -507,7 +510,7 @@ Index: libx11/nls/locale.alias.pre
  bulgarian:					bg_BG.CP1251
  c-french.iso88591:				fr_CA.ISO8859-1
  catalan:					ca_ES.ISO8859-1
-@@ -1200,11 +1210,11 @@
+@@ -1215,11 +1234,11 @@
  dutch:						nl_NL.ISO8859-1
  dutch.iso88591:					nl_BE.ISO8859-1
  eesti:						et_EE.ISO8859-1
@@ -521,7 +524,7 @@ Index: libx11/nls/locale.alias.pre
  french:						fr_FR.ISO8859-1
  french.iso88591:				fr_CH.ISO8859-1
  galego:						gl_ES.ISO8859-1
-@@ -1213,8 +1223,8 @@
+@@ -1228,8 +1247,8 @@
  german.iso88591:				de_CH.ISO8859-1
  greek:						el_GR.ISO8859-7
  greek.iso88597:					el_GR.ISO8859-7
@@ -534,8 +537,8 @@ Index: libx11/nls/locale.alias.pre
  icelandic.iso88591:				is_IS.ISO8859-1
 Index: libx11/nls/locale.dir.pre
 ===================================================================
---- libx11.orig/nls/locale.dir.pre
-+++ libx11/nls/locale.dir.pre
+--- libx11.orig/nls/locale.dir.pre	2009-07-19 20:36:43.000000000 +0200
++++ libx11/nls/locale.dir.pre	2009-07-19 20:36:47.000000000 +0200
 @@ -9,8 +9,13 @@
  XCOMM
  
@@ -688,15 +691,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
-@@ -260,6 +291,7 @@
- en_US.UTF-8/XLC_LOCALE:			ar_BH.UTF-8
- en_US.UTF-8/XLC_LOCALE:			ar_DZ.UTF-8
- en_US.UTF-8/XLC_LOCALE:			ar_EG.UTF-8
-+en_US.UTF-8/XLC_LOCALE:			ar_IN.UTF-8
- en_US.UTF-8/XLC_LOCALE:			ar_IQ.UTF-8
- en_US.UTF-8/XLC_LOCALE:			ar_JO.UTF-8
- en_US.UTF-8/XLC_LOCALE:			ar_KW.UTF-8
-@@ -276,12 +308,12 @@
+@@ -277,13 +308,13 @@
  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
@@ -705,12 +700,13 @@ Index: libx11/nls/locale.dir.pre
  en_US.UTF-8/XLC_LOCALE:			bg_BG.UTF-8
  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
 +en_US.UTF-8/XLC_LOCALE:            byn_ER.UTF-8
  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
-@@ -300,18 +332,26 @@
+@@ -302,18 +333,26 @@
  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
@@ -738,15 +734,15 @@ 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
-@@ -335,6 +375,7 @@
+@@ -337,6 +376,7 @@
  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
 +en_US.UTF-8/XLC_LOCALE:			eu_FR.UTF-8
  en_US.UTF-8/XLC_LOCALE:			fa_IR.UTF-8
- fi_FI.UTF-8/XLC_LOCALE:			fi_FI.UTF-8
+ en_US.UTF-8/XLC_LOCALE:			fi_FI.UTF-8
  en_US.UTF-8/XLC_LOCALE:			fo_FO.UTF-8
-@@ -345,6 +386,8 @@
+@@ -347,6 +387,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
@@ -755,7 +751,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 +401,12 @@
+@@ -361,10 +403,12 @@
  en_US.UTF-8/XLC_LOCALE:			it_CH.UTF-8
  en_US.UTF-8/XLC_LOCALE:			it_IT.UTF-8
  en_US.UTF-8/XLC_LOCALE:			iu_CA.UTF-8
@@ -766,9 +762,9 @@ Index: libx11/nls/locale.dir.pre
  en_US.UTF-8/XLC_LOCALE:			kk_KZ.UTF-8
 +en_US.UTF-8/XLC_LOCALE:			km_KH.UTF-8
  en_US.UTF-8/XLC_LOCALE:			kn_IN.UTF-8
- ko_KR.UTF-8/XLC_LOCALE:			ko_KR.UTF-8
- en_US.UTF-8/XLC_LOCALE:			kw_GB.UTF-8
-@@ -372,22 +417,30 @@
+ en_US.UTF-8/XLC_LOCALE:                 ks_IN.UTF-8
+ en_US.UTF-8/XLC_LOCALE:                 ks_IN@devanagari.UTF-8
+@@ -378,23 +422,31 @@
  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
@@ -792,6 +788,7 @@ Index: libx11/nls/locale.dir.pre
 +en_US.UTF-8/XLC_LOCALE:            om_ET.UTF-8
  en_US.UTF-8/XLC_LOCALE:			or_IN.UTF-8
  en_US.UTF-8/XLC_LOCALE:			pa_IN.UTF-8
+ en_US.UTF-8/XLC_LOCALE:			pa_PK.UTF-8
 -en_US.UTF-8/XLC_LOCALE:			pd_DE.UTF-8
 -en_US.UTF-8/XLC_LOCALE:			pd_US.UTF-8
 +XCOMM Presumably, "pd" is "Pennsylvania 'Dutch'", a U.S. dialect of German.
@@ -802,9 +799,9 @@ 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
-@@ -398,11 +451,13 @@
- en_US.UTF-8/XLC_LOCALE:			ru_UA.UTF-8
- en_US.UTF-8/XLC_LOCALE:         rw_RW.UTF-8
+@@ -408,11 +460,13 @@
+ 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
 +en_US.UTF-8/XLC_LOCALE:            sid_ET.UTF-8
  en_US.UTF-8/XLC_LOCALE:			sh_BA.UTF-8
@@ -816,7 +813,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
-@@ -418,6 +473,7 @@
+@@ -428,6 +482,7 @@
  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 f8accc9..9af0cc0 100644
--- a/debian/patches/006_tailor_pt_BR.UTF-8_Compose.diff
+++ b/debian/patches/006_tailor_pt_BR.UTF-8_Compose.diff
@@ -9,9 +9,9 @@ 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,5620 +1,3 @@
+--- libx11.orig/nls/pt_BR.UTF-8/Compose.pre	2009-07-19 20:36:43.000000000 +0200
++++ libx11/nls/pt_BR.UTF-8/Compose.pre	2009-07-19 20:36:47.000000000 +0200
+@@ -1,4275 +1,3 @@
 -XCOMM UTF-8 (Unicode) compose sequence
 -XCOMM David.Monniaux@ens.fr
 -XCOMM
@@ -461,25 +461,22 @@ Index: libx11/nls/pt_BR.UTF-8/Compose.pre
 -<Multi_key> <asciicircum> <1>	: "¹" onesuperior # SUPERSCRIPT ONE
 -<dead_circumflex> <KP_1>	: "¹" onesuperior # SUPERSCRIPT ONE
 -<Multi_key> <asciicircum> <KP_1>	: "¹" onesuperior # SUPERSCRIPT ONE
--<dead_circumflex> <Multi_key> <underscore> <o>	: "º" ordmasculine # MASCULINE ORDINAL INDICATOR
--<Multi_key> <asciicircum> <underscore> <o>	: "º" ordmasculine # MASCULINE ORDINAL INDICATOR
--<dead_circumflex> <Multi_key> <underbar> <o>	: "º" ordmasculine # MASCULINE ORDINAL INDICATOR
--<Multi_key> <asciicircum> <underbar> <o>	: "º" ordmasculine # MASCULINE ORDINAL INDICATOR
+-<dead_circumflex> <Multi_key> <underscore> <o>	: "º" masculine # MASCULINE ORDINAL INDICATOR
+-<Multi_key> <asciicircum> <underscore> <o>	: "º" masculine # MASCULINE ORDINAL INDICATOR
+-<dead_circumflex> <Multi_key> <underbar> <o>	: "º" masculine # MASCULINE ORDINAL INDICATOR
+-<Multi_key> <asciicircum> <underbar> <o>	: "º" masculine # MASCULINE ORDINAL INDICATOR
 -<Multi_key> <1> <4>              	: "¼"   onequarter # VULGAR FRACTION ONE QUARTER
 -<Multi_key> <1> <2>              	: "½"   onehalf # VULGAR FRACTION ONE HALF
 -<Multi_key> <3> <4>              	: "¾"   threequarters # VULGAR FRACTION THREE QUARTERS
 -<dead_grave> <A>	: "À" Agrave # LATIN CAPITAL LETTER A WITH GRAVE
 -<Multi_key> <grave> <A>	: "À" Agrave # LATIN CAPITAL LETTER A WITH GRAVE
--<combining_grave> <A>	: "À" Agrave # LATIN CAPITAL LETTER A WITH GRAVE
 -<dead_acute> <A>	: "Á" Aacute # LATIN CAPITAL LETTER A WITH ACUTE
 -<Multi_key> <acute> <A>	: "Á" Aacute # LATIN CAPITAL LETTER A WITH ACUTE
 -<Multi_key> <apostrophe> <A>	: "Á" Aacute # LATIN CAPITAL LETTER A WITH ACUTE
--<combining_acute> <A>	: "Á" Aacute # LATIN CAPITAL LETTER A WITH ACUTE
 -<dead_circumflex> <A>	: "Â" Acircumflex # LATIN CAPITAL LETTER A WITH CIRCUMFLEX
 -<Multi_key> <asciicircum> <A>	: "Â" Acircumflex # LATIN CAPITAL LETTER A WITH CIRCUMFLEX
 -<dead_tilde> <A>	: "Ã" Atilde # LATIN CAPITAL LETTER A WITH TILDE
 -<Multi_key> <asciitilde> <A>	: "Ã" Atilde # LATIN CAPITAL LETTER A WITH TILDE
--<combining_tilde> <A>	: "Ã" Atilde # LATIN CAPITAL LETTER A WITH TILDE
 -<dead_diaeresis> <A>	: "Ä" Adiaeresis # LATIN CAPITAL LETTER A WITH DIAERESIS
 -<Multi_key> <quotedbl> <A>	: "Ä" Adiaeresis # LATIN CAPITAL LETTER A WITH DIAERESIS
 -<dead_abovering> <A>	: "Å" Aring # LATIN CAPITAL LETTER A WITH RING ABOVE
@@ -489,52 +486,42 @@ Index: libx11/nls/pt_BR.UTF-8/Compose.pre
 -<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
 -<dead_acute> <E>	: "É" Eacute # LATIN CAPITAL LETTER E WITH ACUTE
 -<Multi_key> <acute> <E>	: "É" Eacute # LATIN CAPITAL LETTER E WITH ACUTE
 -<Multi_key> <apostrophe> <E>	: "É" Eacute # LATIN CAPITAL LETTER E WITH ACUTE
--<combining_acute> <E>	: "É" Eacute # LATIN CAPITAL LETTER E WITH ACUTE
 -<dead_circumflex> <E>	: "Ê" Ecircumflex # LATIN CAPITAL LETTER E WITH CIRCUMFLEX
 -<Multi_key> <asciicircum> <E>	: "Ê" Ecircumflex # LATIN CAPITAL LETTER E WITH CIRCUMFLEX
 -<dead_diaeresis> <E>	: "Ë" Ediaeresis # LATIN CAPITAL LETTER E WITH DIAERESIS
 -<Multi_key> <quotedbl> <E>	: "Ë" Ediaeresis # LATIN CAPITAL LETTER E WITH DIAERESIS
 -<dead_grave> <I>	: "Ì" Igrave # LATIN CAPITAL LETTER I WITH GRAVE
 -<Multi_key> <grave> <I>	: "Ì" Igrave # LATIN CAPITAL LETTER I WITH GRAVE
--<combining_grave> <I>	: "Ì" Igrave # LATIN CAPITAL LETTER I WITH GRAVE
 -<dead_acute> <I>	: "Í" Iacute # LATIN CAPITAL LETTER I WITH ACUTE
 -<Multi_key> <acute> <I>	: "Í" Iacute # LATIN CAPITAL LETTER I WITH ACUTE
 -<Multi_key> <apostrophe> <I>	: "Í" Iacute # LATIN CAPITAL LETTER I WITH ACUTE
--<combining_acute> <I>	: "Í" Iacute # LATIN CAPITAL LETTER I WITH ACUTE
 -<dead_circumflex> <I>	: "Î" Icircumflex # LATIN CAPITAL LETTER I WITH CIRCUMFLEX
 -<Multi_key> <asciicircum> <I>	: "Î" Icircumflex # LATIN CAPITAL LETTER I WITH CIRCUMFLEX
 -<dead_diaeresis> <I>	: "Ï" Idiaeresis # LATIN CAPITAL LETTER I WITH DIAERESIS
 -<Multi_key> <quotedbl> <I>	: "Ï" Idiaeresis # LATIN CAPITAL LETTER I WITH DIAERESIS
 -<dead_tilde> <N>	: "Ñ" Ntilde # LATIN CAPITAL LETTER N WITH TILDE
 -<Multi_key> <asciitilde> <N>	: "Ñ" Ntilde # LATIN CAPITAL LETTER N WITH TILDE
--<combining_tilde> <N>	: "Ñ" Ntilde # LATIN CAPITAL LETTER N WITH TILDE
 -<dead_grave> <O>	: "Ò" Ograve # LATIN CAPITAL LETTER O WITH GRAVE
 -<Multi_key> <grave> <O>	: "Ò" Ograve # LATIN CAPITAL LETTER O WITH GRAVE
--<combining_grave> <O>	: "Ò" Ograve # LATIN CAPITAL LETTER O WITH GRAVE
 -<dead_acute> <O>	: "Ó" Oacute # LATIN CAPITAL LETTER O WITH ACUTE
 -<Multi_key> <acute> <O>	: "Ó" Oacute # LATIN CAPITAL LETTER O WITH ACUTE
 -<Multi_key> <apostrophe> <O>	: "Ó" Oacute # LATIN CAPITAL LETTER O WITH ACUTE
--<combining_acute> <O>	: "Ó" Oacute # LATIN CAPITAL LETTER O WITH ACUTE
 -<dead_circumflex> <O>	: "Ô" Ocircumflex # LATIN CAPITAL LETTER O WITH CIRCUMFLEX
 -<Multi_key> <asciicircum> <O>	: "Ô" Ocircumflex # LATIN CAPITAL LETTER O WITH CIRCUMFLEX
 -<dead_tilde> <O>	: "Õ" Otilde # LATIN CAPITAL LETTER O WITH TILDE
 -<Multi_key> <asciitilde> <O>	: "Õ" Otilde # LATIN CAPITAL LETTER O WITH TILDE
--<combining_tilde> <O>	: "Õ" Otilde # LATIN CAPITAL LETTER O WITH TILDE
 -<dead_diaeresis> <O>	: "Ö" Odiaeresis # LATIN CAPITAL LETTER O WITH DIAERESIS
 -<Multi_key> <quotedbl> <O>	: "Ö" Odiaeresis # LATIN CAPITAL LETTER O WITH DIAERESIS
 -<Multi_key> <slash> <O>	: "Ø" Oslash # LATIN CAPITAL LETTER O WITH STROKE
 -<Multi_key> <KP_Divide> <O>	: "Ø" Oslash # LATIN CAPITAL LETTER O WITH STROKE
 -<dead_grave> <U>	: "Ù" Ugrave # LATIN CAPITAL LETTER U WITH GRAVE
 -<Multi_key> <grave> <U>	: "Ù" Ugrave # LATIN CAPITAL LETTER U WITH GRAVE
--<combining_grave> <U>	: "Ù" Ugrave # LATIN CAPITAL LETTER U WITH GRAVE
 -<dead_acute> <U>	: "Ú" Uacute # LATIN CAPITAL LETTER U WITH ACUTE
 -<Multi_key> <acute> <U>	: "Ú" Uacute # LATIN CAPITAL LETTER U WITH ACUTE
 -<Multi_key> <apostrophe> <U>	: "Ú" Uacute # LATIN CAPITAL LETTER U WITH ACUTE
--<combining_acute> <U>	: "Ú" Uacute # LATIN CAPITAL LETTER U WITH ACUTE
 -<dead_circumflex> <U>	: "Û" Ucircumflex # LATIN CAPITAL LETTER U WITH CIRCUMFLEX
 -<Multi_key> <asciicircum> <U>	: "Û" Ucircumflex # LATIN CAPITAL LETTER U WITH CIRCUMFLEX
 -<dead_diaeresis> <U>	: "Ü" Udiaeresis # LATIN CAPITAL LETTER U WITH DIAERESIS
@@ -542,19 +529,15 @@ Index: libx11/nls/pt_BR.UTF-8/Compose.pre
 -<dead_acute> <Y>	: "Ý" Yacute # LATIN CAPITAL LETTER Y WITH ACUTE
 -<Multi_key> <acute> <Y>	: "Ý" Yacute # LATIN CAPITAL LETTER Y WITH ACUTE
 -<Multi_key> <apostrophe> <Y>	: "Ý" Yacute # LATIN CAPITAL LETTER Y WITH ACUTE
--<combining_acute> <Y>	: "Ý" Yacute # LATIN CAPITAL LETTER Y WITH ACUTE
 -<dead_grave> <a>	: "à" agrave # LATIN SMALL LETTER A WITH GRAVE
 -<Multi_key> <grave> <a>	: "à" agrave # LATIN SMALL LETTER A WITH GRAVE
--<combining_grave> <a>	: "à" agrave # LATIN SMALL LETTER A WITH GRAVE
 -<dead_acute> <a>	: "á" aacute # LATIN SMALL LETTER A WITH ACUTE
 -<Multi_key> <acute> <a>	: "á" aacute # LATIN SMALL LETTER A WITH ACUTE
 -<Multi_key> <apostrophe> <a>	: "á" aacute # LATIN SMALL LETTER A WITH ACUTE
--<combining_acute> <a>	: "á" aacute # LATIN SMALL LETTER A WITH ACUTE
 -<dead_circumflex> <a>	: "â" acircumflex # LATIN SMALL LETTER A WITH CIRCUMFLEX
 -<Multi_key> <asciicircum> <a>	: "â" acircumflex # LATIN SMALL LETTER A WITH CIRCUMFLEX
 -<dead_tilde> <a>	: "ã" atilde # LATIN SMALL LETTER A WITH TILDE
 -<Multi_key> <asciitilde> <a>	: "ã" atilde # LATIN SMALL LETTER A WITH TILDE
--<combining_tilde> <a>	: "ã" atilde # LATIN SMALL LETTER A WITH TILDE
 -<dead_diaeresis> <a>	: "ä" adiaeresis # LATIN SMALL LETTER A WITH DIAERESIS
 -<Multi_key> <quotedbl> <a>	: "ä" adiaeresis # LATIN SMALL LETTER A WITH DIAERESIS
 -<dead_abovering> <a>	: "å" aring # LATIN SMALL LETTER A WITH RING ABOVE
@@ -564,52 +547,42 @@ Index: libx11/nls/pt_BR.UTF-8/Compose.pre
 -<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
 -<dead_acute> <e>	: "é" eacute # LATIN SMALL LETTER E WITH ACUTE
 -<Multi_key> <acute> <e>	: "é" eacute # LATIN SMALL LETTER E WITH ACUTE
 -<Multi_key> <apostrophe> <e>	: "é" eacute # LATIN SMALL LETTER E WITH ACUTE
--<combining_acute> <e>	: "é" eacute # LATIN SMALL LETTER E WITH ACUTE
 -<dead_circumflex> <e>	: "ê" ecircumflex # LATIN SMALL LETTER E WITH CIRCUMFLEX
 -<Multi_key> <asciicircum> <e>	: "ê" ecircumflex # LATIN SMALL LETTER E WITH CIRCUMFLEX
 -<dead_diaeresis> <e>	: "ë" ediaeresis # LATIN SMALL LETTER E WITH DIAERESIS
 -<Multi_key> <quotedbl> <e>	: "ë" ediaeresis # LATIN SMALL LETTER E WITH DIAERESIS
 -<dead_grave> <i>	: "ì" igrave # LATIN SMALL LETTER I WITH GRAVE
 -<Multi_key> <grave> <i>	: "ì" igrave # LATIN SMALL LETTER I WITH GRAVE
--<combining_grave> <i>	: "ì" igrave # LATIN SMALL LETTER I WITH GRAVE
 -<dead_acute> <i>	: "í" iacute # LATIN SMALL LETTER I WITH ACUTE
 -<Multi_key> <acute> <i>	: "í" iacute # LATIN SMALL LETTER I WITH ACUTE
 -<Multi_key> <apostrophe> <i>	: "í" iacute # LATIN SMALL LETTER I WITH ACUTE
--<combining_acute> <i>	: "í" iacute # LATIN SMALL LETTER I WITH ACUTE
 -<dead_circumflex> <i>	: "î" icircumflex # LATIN SMALL LETTER I WITH CIRCUMFLEX
 -<Multi_key> <asciicircum> <i>	: "î" icircumflex # LATIN SMALL LETTER I WITH CIRCUMFLEX
 -<dead_diaeresis> <i>	: "ï" idiaeresis # LATIN SMALL LETTER I WITH DIAERESIS
 -<Multi_key> <quotedbl> <i>	: "ï" idiaeresis # LATIN SMALL LETTER I WITH DIAERESIS
 -<dead_tilde> <n>	: "ñ" ntilde # LATIN SMALL LETTER N WITH TILDE
 -<Multi_key> <asciitilde> <n>	: "ñ" ntilde # LATIN SMALL LETTER N WITH TILDE
--<combining_tilde> <n>	: "ñ" ntilde # LATIN SMALL LETTER N WITH TILDE
 -<dead_grave> <o>	: "ò" ograve # LATIN SMALL LETTER O WITH GRAVE
 -<Multi_key> <grave> <o>	: "ò" ograve # LATIN SMALL LETTER O WITH GRAVE
--<combining_grave> <o>	: "ò" ograve # LATIN SMALL LETTER O WITH GRAVE
 -<dead_acute> <o>	: "ó" oacute # LATIN SMALL LETTER O WITH ACUTE
 -<Multi_key> <acute> <o>	: "ó" oacute # LATIN SMALL LETTER O WITH ACUTE
 -<Multi_key> <apostrophe> <o>	: "ó" oacute # LATIN SMALL LETTER O WITH ACUTE
--<combining_acute> <o>	: "ó" oacute # LATIN SMALL LETTER O WITH ACUTE
 -<dead_circumflex> <o>	: "ô" ocircumflex # LATIN SMALL LETTER O WITH CIRCUMFLEX
 -<Multi_key> <asciicircum> <o>	: "ô" ocircumflex # LATIN SMALL LETTER O WITH CIRCUMFLEX
 -<dead_tilde> <o>	: "õ" otilde # LATIN SMALL LETTER O WITH TILDE
 -<Multi_key> <asciitilde> <o>	: "õ" otilde # LATIN SMALL LETTER O WITH TILDE
--<combining_tilde> <o>	: "õ" otilde # LATIN SMALL LETTER O WITH TILDE
 -<dead_diaeresis> <o>	: "ö" odiaeresis # LATIN SMALL LETTER O WITH DIAERESIS
 -<Multi_key> <quotedbl> <o>	: "ö" odiaeresis # LATIN SMALL LETTER O WITH DIAERESIS
 -<Multi_key> <slash> <o>	: "ø" oslash # LATIN SMALL LETTER O WITH STROKE
 -<Multi_key> <KP_Divide> <o>	: "ø" oslash # LATIN SMALL LETTER O WITH STROKE
 -<dead_grave> <u>	: "ù" ugrave # LATIN SMALL LETTER U WITH GRAVE
 -<Multi_key> <grave> <u>	: "ù" ugrave # LATIN SMALL LETTER U WITH GRAVE
--<combining_grave> <u>	: "ù" ugrave # LATIN SMALL LETTER U WITH GRAVE
 -<dead_acute> <u>	: "ú" uacute # LATIN SMALL LETTER U WITH ACUTE
 -<Multi_key> <acute> <u>	: "ú" uacute # LATIN SMALL LETTER U WITH ACUTE
 -<Multi_key> <apostrophe> <u>	: "ú" uacute # LATIN SMALL LETTER U WITH ACUTE
--<combining_acute> <u>	: "ú" uacute # LATIN SMALL LETTER U WITH ACUTE
 -<dead_circumflex> <u>	: "û" ucircumflex # LATIN SMALL LETTER U WITH CIRCUMFLEX
 -<Multi_key> <asciicircum> <u>	: "û" ucircumflex # LATIN SMALL LETTER U WITH CIRCUMFLEX
 -<dead_diaeresis> <u>	: "ü" udiaeresis # LATIN SMALL LETTER U WITH DIAERESIS
@@ -617,7 +590,6 @@ Index: libx11/nls/pt_BR.UTF-8/Compose.pre
 -<dead_acute> <y>	: "ý" yacute # LATIN SMALL LETTER Y WITH ACUTE
 -<Multi_key> <acute> <y>	: "ý" yacute # LATIN SMALL LETTER Y WITH ACUTE
 -<Multi_key> <apostrophe> <y>	: "ý" yacute # LATIN SMALL LETTER Y WITH ACUTE
--<combining_acute> <y>	: "ý" yacute # LATIN SMALL LETTER Y WITH ACUTE
 -<dead_diaeresis> <y>	: "ÿ" ydiaeresis # LATIN SMALL LETTER Y WITH DIAERESIS
 -<Multi_key> <quotedbl> <y>	: "ÿ" ydiaeresis # LATIN SMALL LETTER Y WITH DIAERESIS
 -<dead_macron> <A>	: "Ā" U0100 # LATIN CAPITAL LETTER A WITH MACRON
@@ -640,11 +612,9 @@ Index: libx11/nls/pt_BR.UTF-8/Compose.pre
  <dead_acute> <C>	: "Ç" Ccedilla # LATIN CAPITAL LETTER C WITH CEDILLA
 -<Multi_key> <acute> <C>	: "Ć" U0106 # LATIN CAPITAL LETTER C WITH ACUTE
 -<Multi_key> <apostrophe> <C>	: "Ć" U0106 # LATIN CAPITAL LETTER C WITH ACUTE
--<combining_acute> <C>	: "Ć" U0106 # LATIN CAPITAL LETTER C WITH ACUTE
  <dead_acute> <c>	: "ç" ccedilla # LATIN SMALL LETTER C WITH CEDILLA
 -<Multi_key> <acute> <c>	: "ć" U0107 # LATIN SMALL LETTER C WITH ACUTE
 -<Multi_key> <apostrophe> <c>	: "ć" U0107 # LATIN SMALL LETTER C WITH ACUTE
--<combining_acute> <c>	: "ć" U0107 # LATIN SMALL LETTER C WITH ACUTE
 -<dead_circumflex> <C>	: "Ĉ" U0108 # LATIN CAPITAL LETTER C WITH CIRCUMFLEX
 -<Multi_key> <asciicircum> <C>	: "Ĉ" U0108 # LATIN CAPITAL LETTER C WITH CIRCUMFLEX
 -<dead_circumflex> <c>	: "ĉ" U0109 # LATIN SMALL LETTER C WITH CIRCUMFLEX
@@ -719,10 +689,8 @@ Index: libx11/nls/pt_BR.UTF-8/Compose.pre
 -<Multi_key> <KP_Divide> <h>	: "ħ" U0127 # LATIN SMALL LETTER H WITH STROKE
 -<dead_tilde> <I>	: "Ĩ" U0128 # LATIN CAPITAL LETTER I WITH TILDE
 -<Multi_key> <asciitilde> <I>	: "Ĩ" U0128 # LATIN CAPITAL LETTER I WITH TILDE
--<combining_tilde> <I>	: "Ĩ" U0128 # LATIN CAPITAL LETTER I WITH TILDE
 -<dead_tilde> <i>	: "ĩ" U0129 # LATIN SMALL LETTER I WITH TILDE
 -<Multi_key> <asciitilde> <i>	: "ĩ" U0129 # LATIN SMALL LETTER I WITH TILDE
--<combining_tilde> <i>	: "ĩ" U0129 # LATIN SMALL LETTER I WITH TILDE
 -<dead_macron> <I>	: "Ī" U012A # LATIN CAPITAL LETTER I WITH MACRON
 -<Multi_key> <macron> <I>	: "Ī" U012A # LATIN CAPITAL LETTER I WITH MACRON
 -<Multi_key> <underscore> <I>	: "Ī" U012A # LATIN CAPITAL LETTER I WITH MACRON
@@ -754,11 +722,9 @@ Index: libx11/nls/pt_BR.UTF-8/Compose.pre
 -<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
--<combining_acute> <L>	: "Ĺ" U0139 # LATIN CAPITAL LETTER L WITH ACUTE
 -<dead_acute> <l>	: "ĺ" U013A # LATIN SMALL LETTER L WITH ACUTE
 -<Multi_key> <acute> <l>	: "ĺ" U013A # LATIN SMALL LETTER L WITH ACUTE
 -<Multi_key> <apostrophe> <l>	: "ĺ" U013A # LATIN SMALL LETTER L WITH ACUTE
--<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
@@ -776,11 +742,9 @@ Index: libx11/nls/pt_BR.UTF-8/Compose.pre
 -<dead_acute> <N>	: "Ń" U0143 # LATIN CAPITAL LETTER N WITH ACUTE
 -<Multi_key> <acute> <N>	: "Ń" U0143 # LATIN CAPITAL LETTER N WITH ACUTE
 -<Multi_key> <apostrophe> <N>	: "Ń" U0143 # LATIN CAPITAL LETTER N WITH ACUTE
--<combining_acute> <N>	: "Ń" U0143 # LATIN CAPITAL LETTER N WITH ACUTE
 -<dead_acute> <n>	: "ń" U0144 # LATIN SMALL LETTER N WITH ACUTE
 -<Multi_key> <acute> <n>	: "ń" U0144 # LATIN SMALL LETTER N WITH ACUTE
 -<Multi_key> <apostrophe> <n>	: "ń" U0144 # LATIN SMALL LETTER N WITH ACUTE
--<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
@@ -810,11 +774,9 @@ Index: libx11/nls/pt_BR.UTF-8/Compose.pre
 -<dead_acute> <R>	: "Ŕ" U0154 # LATIN CAPITAL LETTER R WITH ACUTE
 -<Multi_key> <acute> <R>	: "Ŕ" U0154 # LATIN CAPITAL LETTER R WITH ACUTE
 -<Multi_key> <apostrophe> <R>	: "Ŕ" U0154 # LATIN CAPITAL LETTER R WITH ACUTE
--<combining_acute> <R>	: "Ŕ" U0154 # LATIN CAPITAL LETTER R WITH ACUTE
 -<dead_acute> <r>	: "ŕ" U0155 # LATIN SMALL LETTER R WITH ACUTE
 -<Multi_key> <acute> <r>	: "ŕ" U0155 # LATIN SMALL LETTER R WITH ACUTE
 -<Multi_key> <apostrophe> <r>	: "ŕ" U0155 # LATIN SMALL LETTER R WITH ACUTE
--<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
@@ -828,11 +790,9 @@ Index: libx11/nls/pt_BR.UTF-8/Compose.pre
 -<dead_acute> <S>	: "Ś" U015A # LATIN CAPITAL LETTER S WITH ACUTE
 -<Multi_key> <acute> <S>	: "Ś" U015A # LATIN CAPITAL LETTER S WITH ACUTE
 -<Multi_key> <apostrophe> <S>	: "Ś" U015A # LATIN CAPITAL LETTER S WITH ACUTE
--<combining_acute> <S>	: "Ś" U015A # LATIN CAPITAL LETTER S WITH ACUTE
 -<dead_acute> <s>	: "ś" U015B # LATIN SMALL LETTER S WITH ACUTE
 -<Multi_key> <acute> <s>	: "ś" U015B # LATIN SMALL LETTER S WITH ACUTE
 -<Multi_key> <apostrophe> <s>	: "ś" U015B # LATIN SMALL LETTER S WITH ACUTE
--<combining_acute> <s>	: "ś" U015B # LATIN SMALL LETTER S WITH ACUTE
 -<dead_circumflex> <S>	: "Ŝ" U015C # LATIN CAPITAL LETTER S WITH CIRCUMFLEX
 -<Multi_key> <asciicircum> <S>	: "Ŝ" U015C # LATIN CAPITAL LETTER S WITH CIRCUMFLEX
 -<dead_circumflex> <s>	: "ŝ" U015D # LATIN SMALL LETTER S WITH CIRCUMFLEX
@@ -863,10 +823,8 @@ Index: libx11/nls/pt_BR.UTF-8/Compose.pre
 -<Multi_key> <KP_Divide> <t>	: "ŧ" U0167 # LATIN SMALL LETTER T WITH STROKE
 -<dead_tilde> <U>	: "Ũ" U0168 # LATIN CAPITAL LETTER U WITH TILDE
 -<Multi_key> <asciitilde> <U>	: "Ũ" U0168 # LATIN CAPITAL LETTER U WITH TILDE
--<combining_tilde> <U>	: "Ũ" U0168 # LATIN CAPITAL LETTER U WITH TILDE
 -<dead_tilde> <u>	: "ũ" U0169 # LATIN SMALL LETTER U WITH TILDE
 -<Multi_key> <asciitilde> <u>	: "ũ" U0169 # LATIN SMALL LETTER U WITH TILDE
--<combining_tilde> <u>	: "ũ" U0169 # LATIN SMALL LETTER U WITH TILDE
 -<dead_macron> <U>	: "Ū" U016A # LATIN CAPITAL LETTER U WITH MACRON
 -<Multi_key> <macron> <U>	: "Ū" U016A # LATIN CAPITAL LETTER U WITH MACRON
 -<Multi_key> <underscore> <U>	: "Ū" U016A # LATIN CAPITAL LETTER U WITH MACRON
@@ -904,11 +862,9 @@ Index: libx11/nls/pt_BR.UTF-8/Compose.pre
 -<dead_acute> <Z>	: "Ź" U0179 # LATIN CAPITAL LETTER Z WITH ACUTE
 -<Multi_key> <acute> <Z>	: "Ź" U0179 # LATIN CAPITAL LETTER Z WITH ACUTE
 -<Multi_key> <apostrophe> <Z>	: "Ź" U0179 # LATIN CAPITAL LETTER Z WITH ACUTE
--<combining_acute> <Z>	: "Ź" U0179 # LATIN CAPITAL LETTER Z WITH ACUTE
 -<dead_acute> <z>	: "ź" U017A # LATIN SMALL LETTER Z WITH ACUTE
 -<Multi_key> <acute> <z>	: "ź" U017A # LATIN SMALL LETTER Z WITH ACUTE
 -<Multi_key> <apostrophe> <z>	: "ź" U017A # LATIN SMALL LETTER Z WITH ACUTE
--<combining_acute> <z>	: "ź" U017A # LATIN SMALL LETTER Z WITH ACUTE
 -<dead_abovedot> <Z>	: "Ż" U017B # LATIN CAPITAL LETTER Z WITH DOT ABOVE
 -<Multi_key> <period> <Z>	: "Ż" U017B # LATIN CAPITAL LETTER Z WITH DOT ABOVE
 -<dead_abovedot> <z>	: "ż" U017C # LATIN SMALL LETTER Z WITH DOT ABOVE
@@ -976,9 +932,6 @@ Index: libx11/nls/pt_BR.UTF-8/Compose.pre
 -<Multi_key> <acute> <quotedbl> <U>	: "Ǘ" U01D7 # LATIN CAPITAL LETTER U WITH DIAERESIS AND ACUTE
 -<Multi_key> <apostrophe> <dead_diaeresis> <U>	: "Ǘ" U01D7 # LATIN CAPITAL LETTER U WITH DIAERESIS AND ACUTE
 -<Multi_key> <apostrophe> <quotedbl> <U>	: "Ǘ" U01D7 # LATIN CAPITAL LETTER U WITH DIAERESIS AND ACUTE
--<combining_acute> <Udiaeresis>	: "Ǘ" U01D7 # LATIN CAPITAL LETTER U WITH DIAERESIS AND ACUTE
--<combining_acute> <dead_diaeresis> <U>	: "Ǘ" U01D7 # LATIN CAPITAL LETTER U WITH DIAERESIS AND ACUTE
--<combining_acute> <Multi_key> <quotedbl> <U>	: "Ǘ" U01D7 # LATIN CAPITAL LETTER U WITH DIAERESIS AND ACUTE
 -<dead_acute> <udiaeresis>	: "ǘ" U01D8 # LATIN SMALL LETTER U WITH DIAERESIS AND ACUTE
 -<Multi_key> <acute> <udiaeresis>	: "ǘ" U01D8 # LATIN SMALL LETTER U WITH DIAERESIS AND ACUTE
 -<Multi_key> <apostrophe> <udiaeresis>	: "ǘ" U01D8 # LATIN SMALL LETTER U WITH DIAERESIS AND ACUTE
@@ -988,9 +941,6 @@ Index: libx11/nls/pt_BR.UTF-8/Compose.pre
 -<Multi_key> <acute> <quotedbl> <u>	: "ǘ" U01D8 # LATIN SMALL LETTER U WITH DIAERESIS AND ACUTE
 -<Multi_key> <apostrophe> <dead_diaeresis> <u>	: "ǘ" U01D8 # LATIN SMALL LETTER U WITH DIAERESIS AND ACUTE
 -<Multi_key> <apostrophe> <quotedbl> <u>	: "ǘ" U01D8 # LATIN SMALL LETTER U WITH DIAERESIS AND ACUTE
--<combining_acute> <udiaeresis>	: "ǘ" U01D8 # LATIN SMALL LETTER U WITH DIAERESIS AND ACUTE
--<combining_acute> <dead_diaeresis> <u>	: "ǘ" U01D8 # LATIN SMALL LETTER U WITH DIAERESIS AND ACUTE
--<combining_acute> <Multi_key> <quotedbl> <u>	: "ǘ" U01D8 # LATIN SMALL LETTER U WITH DIAERESIS AND ACUTE
 -<dead_caron> <Udiaeresis>	: "Ǚ" U01D9 # LATIN CAPITAL LETTER U WITH DIAERESIS AND CARON
 -<Multi_key> <c> <Udiaeresis>	: "Ǚ" U01D9 # LATIN CAPITAL LETTER U WITH DIAERESIS AND CARON
 -<dead_caron> <dead_diaeresis> <U>	: "Ǚ" U01D9 # LATIN CAPITAL LETTER U WITH DIAERESIS AND CARON
@@ -1009,18 +959,12 @@ Index: libx11/nls/pt_BR.UTF-8/Compose.pre
 -<dead_grave> <Multi_key> <quotedbl> <U>	: "Ǜ" U01DB # LATIN CAPITAL LETTER U WITH DIAERESIS AND GRAVE
 -<Multi_key> <grave> <dead_diaeresis> <U>	: "Ǜ" U01DB # LATIN CAPITAL LETTER U WITH DIAERESIS AND GRAVE
 -<Multi_key> <grave> <quotedbl> <U>	: "Ǜ" U01DB # LATIN CAPITAL LETTER U WITH DIAERESIS AND GRAVE
--<combining_grave> <Udiaeresis>	: "Ǜ" U01DB # LATIN CAPITAL LETTER U WITH DIAERESIS AND GRAVE
--<combining_grave> <dead_diaeresis> <U>	: "Ǜ" U01DB # LATIN CAPITAL LETTER U WITH DIAERESIS AND GRAVE
--<combining_grave> <Multi_key> <quotedbl> <U>	: "Ǜ" U01DB # LATIN CAPITAL LETTER U WITH DIAERESIS AND GRAVE
 -<dead_grave> <udiaeresis>	: "ǜ" U01DC # LATIN SMALL LETTER U WITH DIAERESIS AND GRAVE
 -<Multi_key> <grave> <udiaeresis>	: "ǜ" U01DC # LATIN SMALL LETTER U WITH DIAERESIS AND GRAVE
 -<dead_grave> <dead_diaeresis> <u>	: "ǜ" U01DC # LATIN SMALL LETTER U WITH DIAERESIS AND GRAVE
 -<dead_grave> <Multi_key> <quotedbl> <u>	: "ǜ" U01DC # LATIN SMALL LETTER U WITH DIAERESIS AND GRAVE
 -<Multi_key> <grave> <dead_diaeresis> <u>	: "ǜ" U01DC # LATIN SMALL LETTER U WITH DIAERESIS AND GRAVE
 -<Multi_key> <grave> <quotedbl> <u>	: "ǜ" U01DC # LATIN SMALL LETTER U WITH DIAERESIS AND GRAVE
--<combining_grave> <udiaeresis>	: "ǜ" U01DC # LATIN SMALL LETTER U WITH DIAERESIS AND GRAVE
--<combining_grave> <dead_diaeresis> <u>	: "ǜ" U01DC # LATIN SMALL LETTER U WITH DIAERESIS AND GRAVE
--<combining_grave> <Multi_key> <quotedbl> <u>	: "ǜ" U01DC # LATIN SMALL LETTER U WITH DIAERESIS AND GRAVE
 -<dead_macron> <Adiaeresis>	: "Ǟ" U01DE # LATIN CAPITAL LETTER A WITH DIAERESIS AND MACRON
 -<Multi_key> <macron> <Adiaeresis>	: "Ǟ" U01DE # LATIN CAPITAL LETTER A WITH DIAERESIS AND MACRON
 -<Multi_key> <underscore> <Adiaeresis>	: "Ǟ" U01DE # LATIN CAPITAL LETTER A WITH DIAERESIS AND MACRON
@@ -1106,17 +1050,13 @@ Index: libx11/nls/pt_BR.UTF-8/Compose.pre
 -<dead_acute> <G>	: "Ǵ" U01F4 # LATIN CAPITAL LETTER G WITH ACUTE
 -<Multi_key> <acute> <G>	: "Ǵ" U01F4 # LATIN CAPITAL LETTER G WITH ACUTE
 -<Multi_key> <apostrophe> <G>	: "Ǵ" U01F4 # LATIN CAPITAL LETTER G WITH ACUTE
--<combining_acute> <G>	: "Ǵ" U01F4 # LATIN CAPITAL LETTER G WITH ACUTE
 -<dead_acute> <g>	: "ǵ" U01F5 # LATIN SMALL LETTER G WITH ACUTE
 -<Multi_key> <acute> <g>	: "ǵ" U01F5 # LATIN SMALL LETTER G WITH ACUTE
 -<Multi_key> <apostrophe> <g>	: "ǵ" U01F5 # LATIN SMALL LETTER G WITH ACUTE
--<combining_acute> <g>	: "ǵ" U01F5 # LATIN SMALL LETTER G WITH ACUTE
 -<dead_grave> <N>	: "Ǹ" U01F8 # LATIN CAPITAL LETTER N WITH GRAVE
 -<Multi_key> <grave> <N>	: "Ǹ" U01F8 # LATIN CAPITAL LETTER N WITH GRAVE
--<combining_grave> <N>	: "Ǹ" U01F8 # LATIN CAPITAL LETTER N WITH GRAVE
 -<dead_grave> <n>	: "ǹ" U01F9 # LATIN SMALL LETTER N WITH GRAVE
 -<Multi_key> <grave> <n>	: "ǹ" U01F9 # LATIN SMALL LETTER N WITH GRAVE
--<combining_grave> <n>	: "ǹ" U01F9 # LATIN SMALL LETTER N WITH GRAVE
 -<dead_acute> <Aring>	: "Ǻ" U01FA # LATIN CAPITAL LETTER A WITH RING ABOVE AND ACUTE
 -<Multi_key> <acute> <Aring>	: "Ǻ" U01FA # LATIN CAPITAL LETTER A WITH RING ABOVE AND ACUTE
 -<Multi_key> <apostrophe> <Aring>	: "Ǻ" U01FA # LATIN CAPITAL LETTER A WITH RING ABOVE AND ACUTE
@@ -1126,9 +1066,6 @@ Index: libx11/nls/pt_BR.UTF-8/Compose.pre
 -<Multi_key> <acute> <o> <A>	: "Ǻ" U01FA # LATIN CAPITAL LETTER A WITH RING ABOVE AND ACUTE
 -<Multi_key> <apostrophe> <dead_abovering> <A>	: "Ǻ" U01FA # LATIN CAPITAL LETTER A WITH RING ABOVE AND ACUTE
 -<Multi_key> <apostrophe> <o> <A>	: "Ǻ" U01FA # LATIN CAPITAL LETTER A WITH RING ABOVE AND ACUTE
--<combining_acute> <Aring>	: "Ǻ" U01FA # LATIN CAPITAL LETTER A WITH RING ABOVE AND ACUTE
--<combining_acute> <dead_abovering> <A>	: "Ǻ" U01FA # LATIN CAPITAL LETTER A WITH RING ABOVE AND ACUTE
--<combining_acute> <Multi_key> <o> <A>	: "Ǻ" U01FA # LATIN CAPITAL LETTER A WITH RING ABOVE AND ACUTE
 -<dead_acute> <aring>	: "ǻ" U01FB # LATIN SMALL LETTER A WITH RING ABOVE AND ACUTE
 -<Multi_key> <acute> <aring>	: "ǻ" U01FB # LATIN SMALL LETTER A WITH RING ABOVE AND ACUTE
 -<Multi_key> <apostrophe> <aring>	: "ǻ" U01FB # LATIN SMALL LETTER A WITH RING ABOVE AND ACUTE
@@ -1138,17 +1075,12 @@ Index: libx11/nls/pt_BR.UTF-8/Compose.pre
 -<Multi_key> <acute> <o> <a>	: "ǻ" U01FB # LATIN SMALL LETTER A WITH RING ABOVE AND ACUTE
 -<Multi_key> <apostrophe> <dead_abovering> <a>	: "ǻ" U01FB # LATIN SMALL LETTER A WITH RING ABOVE AND ACUTE
 -<Multi_key> <apostrophe> <o> <a>	: "ǻ" U01FB # LATIN SMALL LETTER A WITH RING ABOVE AND ACUTE
--<combining_acute> <aring>	: "ǻ" U01FB # LATIN SMALL LETTER A WITH RING ABOVE AND ACUTE
--<combining_acute> <dead_abovering> <a>	: "ǻ" U01FB # LATIN SMALL LETTER A WITH RING ABOVE AND ACUTE
--<combining_acute> <Multi_key> <o> <a>	: "ǻ" U01FB # LATIN SMALL LETTER A WITH RING ABOVE AND ACUTE
 -<dead_acute> <AE>	: "Ǽ" U01FC # LATIN CAPITAL LETTER AE WITH ACUTE
 -<Multi_key> <acute> <AE>	: "Ǽ" U01FC # LATIN CAPITAL LETTER AE WITH ACUTE
 -<Multi_key> <apostrophe> <AE>	: "Ǽ" U01FC # LATIN CAPITAL LETTER AE WITH ACUTE
--<combining_acute> <AE>	: "Ǽ" U01FC # LATIN CAPITAL LETTER AE WITH ACUTE
 -<dead_acute> <ae>	: "ǽ" U01FD # LATIN SMALL LETTER AE WITH ACUTE
 -<Multi_key> <acute> <ae>	: "ǽ" U01FD # LATIN SMALL LETTER AE WITH ACUTE
 -<Multi_key> <apostrophe> <ae>	: "ǽ" U01FD # LATIN SMALL LETTER AE WITH ACUTE
--<combining_acute> <ae>	: "ǽ" U01FD # LATIN SMALL LETTER AE WITH ACUTE
 -<dead_acute> <Ooblique>	: "Ǿ" U01FE # LATIN CAPITAL LETTER O WITH STROKE AND ACUTE
 -<Multi_key> <acute> <Ooblique>	: "Ǿ" U01FE # LATIN CAPITAL LETTER O WITH STROKE AND ACUTE
 -<Multi_key> <apostrophe> <Ooblique>	: "Ǿ" U01FE # LATIN CAPITAL LETTER O WITH STROKE AND ACUTE
@@ -1158,9 +1090,6 @@ Index: libx11/nls/pt_BR.UTF-8/Compose.pre
 -<dead_acute> <Multi_key> <KP_Divide> <O>	: "Ǿ" U01FE # LATIN CAPITAL LETTER O WITH STROKE AND ACUTE
 -<Multi_key> <acute> <KP_Divide> <O>	: "Ǿ" U01FE # LATIN CAPITAL LETTER O WITH STROKE AND ACUTE
 -<Multi_key> <apostrophe> <KP_Divide> <O>	: "Ǿ" U01FE # LATIN CAPITAL LETTER O WITH STROKE AND ACUTE
--<combining_acute> <Ooblique>	: "Ǿ" U01FE # LATIN CAPITAL LETTER O WITH STROKE AND ACUTE
--<combining_acute> <Multi_key> <slash> <O>	: "Ǿ" U01FE # LATIN CAPITAL LETTER O WITH STROKE AND ACUTE
--<combining_acute> <Multi_key> <KP_Divide> <O>	: "Ǿ" U01FE # LATIN CAPITAL LETTER O WITH STROKE AND ACUTE
 -<dead_acute> <oslash>	: "ǿ" U01FF # LATIN SMALL LETTER O WITH STROKE AND ACUTE
 -<Multi_key> <acute> <oslash>	: "ǿ" U01FF # LATIN SMALL LETTER O WITH STROKE AND ACUTE
 -<Multi_key> <apostrophe> <oslash>	: "ǿ" U01FF # LATIN SMALL LETTER O WITH STROKE AND ACUTE
@@ -1170,37 +1099,34 @@ Index: libx11/nls/pt_BR.UTF-8/Compose.pre
 -<dead_acute> <Multi_key> <KP_Divide> <o>	: "ǿ" U01FF # LATIN SMALL LETTER O WITH STROKE AND ACUTE
 -<Multi_key> <acute> <KP_Divide> <o>	: "ǿ" U01FF # LATIN SMALL LETTER O WITH STROKE AND ACUTE
 -<Multi_key> <apostrophe> <KP_Divide> <o>	: "ǿ" U01FF # LATIN SMALL LETTER O WITH STROKE AND ACUTE
--<combining_acute> <oslash>	: "ǿ" U01FF # LATIN SMALL LETTER O WITH STROKE AND ACUTE
--<combining_acute> <Multi_key> <slash> <o>	: "ǿ" U01FF # LATIN SMALL LETTER O WITH STROKE AND ACUTE
--<combining_acute> <Multi_key> <KP_Divide> <o>	: "ǿ" U01FF # LATIN SMALL LETTER O WITH STROKE AND ACUTE
--<U030f> <A>	: "Ȁ" U0200 # LATIN CAPITAL LETTER A WITH DOUBLE GRAVE
--<U030f> <a>	: "ȁ" U0201 # LATIN SMALL LETTER A WITH DOUBLE GRAVE
--<U0311> <A>	: "Ȃ" U0202 # LATIN CAPITAL LETTER A WITH INVERTED BREVE
--<U0311> <a>	: "ȃ" U0203 # LATIN SMALL LETTER A WITH INVERTED BREVE
--<U030f> <E>	: "Ȅ" U0204 # LATIN CAPITAL LETTER E WITH DOUBLE GRAVE
--<U030f> <e>	: "ȅ" U0205 # LATIN SMALL LETTER E WITH DOUBLE GRAVE
--<U0311> <E>	: "Ȇ" U0206 # LATIN CAPITAL LETTER E WITH INVERTED BREVE
--<U0311> <e>	: "ȇ" U0207 # LATIN SMALL LETTER E WITH INVERTED BREVE
--<U030f> <I>	: "Ȉ" U0208 # LATIN CAPITAL LETTER I WITH DOUBLE GRAVE
--<U030f> <i>	: "ȉ" U0209 # LATIN SMALL LETTER I WITH DOUBLE GRAVE
--<U0311> <I>	: "Ȋ" U020A # LATIN CAPITAL LETTER I WITH INVERTED BREVE
--<U0311> <i>	: "ȋ" U020B # LATIN SMALL LETTER I WITH INVERTED BREVE
--<U030f> <O>	: "Ȍ" U020C # LATIN CAPITAL LETTER O WITH DOUBLE GRAVE
--<U030f> <o>	: "ȍ" U020D # LATIN SMALL LETTER O WITH DOUBLE GRAVE
--<U0311> <O>	: "Ȏ" U020E # LATIN CAPITAL LETTER O WITH INVERTED BREVE
--<U0311> <o>	: "ȏ" U020F # LATIN SMALL LETTER O WITH INVERTED BREVE
--<U030f> <R>	: "Ȑ" U0210 # LATIN CAPITAL LETTER R WITH DOUBLE GRAVE
--<U030f> <r>	: "ȑ" U0211 # LATIN SMALL LETTER R WITH DOUBLE GRAVE
--<U0311> <R>	: "Ȓ" U0212 # LATIN CAPITAL LETTER R WITH INVERTED BREVE
--<U0311> <r>	: "ȓ" U0213 # LATIN SMALL LETTER R WITH INVERTED BREVE
--<U030f> <U>	: "Ȕ" U0214 # LATIN CAPITAL LETTER U WITH DOUBLE GRAVE
--<U030f> <u>	: "ȕ" U0215 # LATIN SMALL LETTER U WITH DOUBLE GRAVE
--<U0311> <U>	: "Ȗ" U0216 # LATIN CAPITAL LETTER U WITH INVERTED BREVE
--<U0311> <u>	: "ȗ" U0217 # LATIN SMALL LETTER U WITH INVERTED BREVE
--<U0326> <S>	: "Ș" U0218 # LATIN CAPITAL LETTER S WITH COMMA BELOW
--<U0326> <s>	: "ș" U0219 # LATIN SMALL LETTER S WITH COMMA BELOW
--<U0326> <T>	: "Ț" U021A # LATIN CAPITAL LETTER T WITH COMMA BELOW
--<U0326> <t>	: "ț" U021B # LATIN SMALL LETTER T WITH COMMA BELOW
+-<dead_double_grave> <A>	: "Ȁ" U0200 # LATIN CAPITAL LETTER A WITH DOUBLE GRAVE
+-<dead_double_grave> <a>	: "ȁ" U0201 # LATIN SMALL LETTER A WITH DOUBLE GRAVE
+-<dead_inverted_breve> <A>	: "Ȃ" U0202 # LATIN CAPITAL LETTER A WITH INVERTED BREVE
+-<dead_inverted_breve> <a>	: "ȃ" U0203 # LATIN SMALL LETTER A WITH INVERTED BREVE
+-<dead_double_grave> <E>	: "Ȅ" U0204 # LATIN CAPITAL LETTER E WITH DOUBLE GRAVE
+-<dead_double_grave> <e>	: "ȅ" U0205 # LATIN SMALL LETTER E WITH DOUBLE GRAVE
+-<dead_inverted_breve> <E>	: "Ȇ" U0206 # LATIN CAPITAL LETTER E WITH INVERTED BREVE
+-<dead_inverted_breve> <e>	: "ȇ" U0207 # LATIN SMALL LETTER E WITH INVERTED BREVE
+-<dead_double_grave> <I>	: "Ȉ" U0208 # LATIN CAPITAL LETTER I WITH DOUBLE GRAVE
+-<dead_double_grave> <i>	: "ȉ" U0209 # LATIN SMALL LETTER I WITH DOUBLE GRAVE
+-<dead_inverted_breve> <I>	: "Ȋ" U020A # LATIN CAPITAL LETTER I WITH INVERTED BREVE
+-<dead_inverted_breve> <i>	: "ȋ" U020B # LATIN SMALL LETTER I WITH INVERTED BREVE
+-<dead_double_grave> <O>	: "Ȍ" U020C # LATIN CAPITAL LETTER O WITH DOUBLE GRAVE
+-<dead_double_grave> <o>	: "ȍ" U020D # LATIN SMALL LETTER O WITH DOUBLE GRAVE
+-<dead_inverted_breve> <O>	: "Ȏ" U020E # LATIN CAPITAL LETTER O WITH INVERTED BREVE
+-<dead_inverted_breve> <o>	: "ȏ" U020F # LATIN SMALL LETTER O WITH INVERTED BREVE
+-<dead_double_grave> <R>	: "Ȑ" U0210 # LATIN CAPITAL LETTER R WITH DOUBLE GRAVE
+-<dead_double_grave> <r>	: "ȑ" U0211 # LATIN SMALL LETTER R WITH DOUBLE GRAVE
+-<dead_inverted_breve> <R>	: "Ȓ" U0212 # LATIN CAPITAL LETTER R WITH INVERTED BREVE
+-<dead_inverted_breve> <r>	: "ȓ" U0213 # LATIN SMALL LETTER R WITH INVERTED BREVE
+-<dead_double_grave> <U>	: "Ȕ" U0214 # LATIN CAPITAL LETTER U WITH DOUBLE GRAVE
+-<dead_double_grave> <u>	: "ȕ" U0215 # LATIN SMALL LETTER U WITH DOUBLE GRAVE
+-<dead_inverted_breve> <U>	: "Ȗ" U0216 # LATIN CAPITAL LETTER U WITH INVERTED BREVE
+-<dead_inverted_breve> <u>	: "ȗ" U0217 # LATIN SMALL LETTER U WITH INVERTED BREVE
+-<dead_belowcomma> <S>	: "Ș" U0218 # LATIN CAPITAL LETTER S WITH COMMA BELOW
+-<dead_belowcomma> <s>	: "ș" U0219 # LATIN SMALL LETTER S WITH COMMA BELOW
+-<dead_belowcomma> <T>	: "Ț" U021A # LATIN CAPITAL LETTER T WITH COMMA BELOW
+-<dead_belowcomma> <t>	: "ț" U021B # LATIN SMALL LETTER T WITH COMMA BELOW
 -<dead_caron> <H>	: "Ȟ" U021E # LATIN CAPITAL LETTER H WITH CARON
 -<Multi_key> <c> <H>	: "Ȟ" U021E # LATIN CAPITAL LETTER H WITH CARON
 -<dead_caron> <h>	: "ȟ" U021F # LATIN SMALL LETTER H WITH CARON
@@ -1242,9 +1168,6 @@ Index: libx11/nls/pt_BR.UTF-8/Compose.pre
 -<Multi_key> <macron> <asciitilde> <O>	: "Ȭ" U022C # LATIN CAPITAL LETTER O WITH TILDE AND MACRON
 -<Multi_key> <underscore> <dead_tilde> <O>	: "Ȭ" U022C # LATIN CAPITAL LETTER O WITH TILDE AND MACRON
 -<Multi_key> <underscore> <asciitilde> <O>	: "Ȭ" U022C # LATIN CAPITAL LETTER O WITH TILDE AND MACRON
--<dead_macron> <combining_tilde> <O>	: "Ȭ" U022C # LATIN CAPITAL LETTER O WITH TILDE AND MACRON
--<Multi_key> <macron> <combining_tilde> <O>	: "Ȭ" U022C # LATIN CAPITAL LETTER O WITH TILDE AND MACRON
--<Multi_key> <underscore> <combining_tilde> <O>	: "Ȭ" U022C # LATIN CAPITAL LETTER O WITH TILDE AND MACRON
 -<dead_macron> <otilde>	: "ȭ" U022D # LATIN SMALL LETTER O WITH TILDE AND MACRON
 -<Multi_key> <macron> <otilde>	: "ȭ" U022D # LATIN SMALL LETTER O WITH TILDE AND MACRON
 -<Multi_key> <underscore> <otilde>	: "ȭ" U022D # LATIN SMALL LETTER O WITH TILDE AND MACRON
@@ -1254,9 +1177,6 @@ Index: libx11/nls/pt_BR.UTF-8/Compose.pre
 -<Multi_key> <macron> <asciitilde> <o>	: "ȭ" U022D # LATIN SMALL LETTER O WITH TILDE AND MACRON
 -<Multi_key> <underscore> <dead_tilde> <o>	: "ȭ" U022D # LATIN SMALL LETTER O WITH TILDE AND MACRON
 -<Multi_key> <underscore> <asciitilde> <o>	: "ȭ" U022D # LATIN SMALL LETTER O WITH TILDE AND MACRON
--<dead_macron> <combining_tilde> <o>	: "ȭ" U022D # LATIN SMALL LETTER O WITH TILDE AND MACRON
--<Multi_key> <macron> <combining_tilde> <o>	: "ȭ" U022D # LATIN SMALL LETTER O WITH TILDE AND MACRON
--<Multi_key> <underscore> <combining_tilde> <o>	: "ȭ" U022D # LATIN SMALL LETTER O WITH TILDE AND MACRON
 -<dead_abovedot> <O>	: "Ȯ" U022E # LATIN CAPITAL LETTER O WITH DOT ABOVE
 -<Multi_key> <period> <O>	: "Ȯ" U022E # LATIN CAPITAL LETTER O WITH DOT ABOVE
 -<dead_abovedot> <o>	: "ȯ" U022F # LATIN SMALL LETTER O WITH DOT ABOVE
@@ -1350,39 +1270,30 @@ Index: libx11/nls/pt_BR.UTF-8/Compose.pre
 -<Multi_key> <quotedbl> <dead_acute>	: "̈́" U0344 # COMBINING GREEK DIALYTIKA TONOS
 -<Multi_key> <quotedbl> <acute>	: "̈́" U0344 # COMBINING GREEK DIALYTIKA TONOS
 -<Multi_key> <quotedbl> <apostrophe>	: "̈́" U0344 # COMBINING GREEK DIALYTIKA TONOS
--<Multi_key> <quotedbl> <combining_acute>	: "̈́" U0344 # COMBINING GREEK DIALYTIKA TONOS
 -<Multi_key> <diaeresis> <dead_acute>	: "΅" U0385 # GREEK DIALYTIKA TONOS
 -<Multi_key> <diaeresis> <acute>	: "΅" U0385 # GREEK DIALYTIKA TONOS
 -<Multi_key> <diaeresis> <apostrophe>	: "΅" U0385 # GREEK DIALYTIKA TONOS
--<Multi_key> <diaeresis> <combining_acute>	: "΅" U0385 # GREEK DIALYTIKA TONOS
 -<dead_acute> <Greek_ALPHA>	: "Ά" U0386 # GREEK CAPITAL LETTER ALPHA WITH TONOS
 -<Multi_key> <acute> <Greek_ALPHA>	: "Ά" U0386 # GREEK CAPITAL LETTER ALPHA WITH TONOS
 -<Multi_key> <apostrophe> <Greek_ALPHA>	: "Ά" U0386 # GREEK CAPITAL LETTER ALPHA WITH TONOS
--<combining_acute> <Greek_ALPHA>	: "Ά" U0386 # GREEK CAPITAL LETTER ALPHA WITH TONOS
 -<dead_acute> <Greek_EPSILON>	: "Έ" U0388 # GREEK CAPITAL LETTER EPSILON WITH TONOS
 -<Multi_key> <acute> <Greek_EPSILON>	: "Έ" U0388 # GREEK CAPITAL LETTER EPSILON WITH TONOS
 -<Multi_key> <apostrophe> <Greek_EPSILON>	: "Έ" U0388 # GREEK CAPITAL LETTER EPSILON WITH TONOS
--<combining_acute> <Greek_EPSILON>	: "Έ" U0388 # GREEK CAPITAL LETTER EPSILON WITH TONOS
 -<dead_acute> <Greek_ETA>	: "Ή" U0389 # GREEK CAPITAL LETTER ETA WITH TONOS
 -<Multi_key> <acute> <Greek_ETA>	: "Ή" U0389 # GREEK CAPITAL LETTER ETA WITH TONOS
 -<Multi_key> <apostrophe> <Greek_ETA>	: "Ή" U0389 # GREEK CAPITAL LETTER ETA WITH TONOS
--<combining_acute> <Greek_ETA>	: "Ή" U0389 # GREEK CAPITAL LETTER ETA WITH TONOS
 -<dead_acute> <Greek_IOTA>	: "Ί" U038A # GREEK CAPITAL LETTER IOTA WITH TONOS
 -<Multi_key> <acute> <Greek_IOTA>	: "Ί" U038A # GREEK CAPITAL LETTER IOTA WITH TONOS
 -<Multi_key> <apostrophe> <Greek_IOTA>	: "Ί" U038A # GREEK CAPITAL LETTER IOTA WITH TONOS
--<combining_acute> <Greek_IOTA>	: "Ί" U038A # GREEK CAPITAL LETTER IOTA WITH TONOS
 -<dead_acute> <Greek_OMICRON>	: "Ό" U038C # GREEK CAPITAL LETTER OMICRON WITH TONOS
 -<Multi_key> <acute> <Greek_OMICRON>	: "Ό" U038C # GREEK CAPITAL LETTER OMICRON WITH TONOS
 -<Multi_key> <apostrophe> <Greek_OMICRON>	: "Ό" U038C # GREEK CAPITAL LETTER OMICRON WITH TONOS
--<combining_acute> <Greek_OMICRON>	: "Ό" U038C # GREEK CAPITAL LETTER OMICRON WITH TONOS
 -<dead_acute> <Greek_UPSILON>	: "Ύ" U038E # GREEK CAPITAL LETTER UPSILON WITH TONOS
 -<Multi_key> <acute> <Greek_UPSILON>	: "Ύ" U038E # GREEK CAPITAL LETTER UPSILON WITH TONOS
 -<Multi_key> <apostrophe> <Greek_UPSILON>	: "Ύ" U038E # GREEK CAPITAL LETTER UPSILON WITH TONOS
--<combining_acute> <Greek_UPSILON>	: "Ύ" U038E # GREEK CAPITAL LETTER UPSILON WITH TONOS
 -<dead_acute> <Greek_OMEGA>	: "Ώ" U038F # GREEK CAPITAL LETTER OMEGA WITH TONOS
 -<Multi_key> <acute> <Greek_OMEGA>	: "Ώ" U038F # GREEK CAPITAL LETTER OMEGA WITH TONOS
 -<Multi_key> <apostrophe> <Greek_OMEGA>	: "Ώ" U038F # GREEK CAPITAL LETTER OMEGA WITH TONOS
--<combining_acute> <Greek_OMEGA>	: "Ώ" U038F # GREEK CAPITAL LETTER OMEGA WITH TONOS
 -<dead_acute> <Greek_iotadieresis>	: "ΐ" U0390 # GREEK SMALL LETTER IOTA WITH DIALYTIKA AND TONOS
 -<Multi_key> <acute> <Greek_iotadieresis>	: "ΐ" U0390 # GREEK SMALL LETTER IOTA WITH DIALYTIKA AND TONOS
 -<Multi_key> <apostrophe> <Greek_iotadieresis>	: "ΐ" U0390 # GREEK SMALL LETTER IOTA WITH DIALYTIKA AND TONOS
@@ -1392,9 +1303,6 @@ Index: libx11/nls/pt_BR.UTF-8/Compose.pre
 -<Multi_key> <acute> <quotedbl> <Greek_iota>	: "ΐ" U0390 # GREEK SMALL LETTER IOTA WITH DIALYTIKA AND TONOS
 -<Multi_key> <apostrophe> <dead_diaeresis> <Greek_iota>	: "ΐ" U0390 # GREEK SMALL LETTER IOTA WITH DIALYTIKA AND TONOS
 -<Multi_key> <apostrophe> <quotedbl> <Greek_iota>	: "ΐ" U0390 # GREEK SMALL LETTER IOTA WITH DIALYTIKA AND TONOS
--<combining_acute> <Greek_iotadieresis>	: "ΐ" U0390 # GREEK SMALL LETTER IOTA WITH DIALYTIKA AND TONOS
--<combining_acute> <dead_diaeresis> <Greek_iota>	: "ΐ" U0390 # GREEK SMALL LETTER IOTA WITH DIALYTIKA AND TONOS
--<combining_acute> <Multi_key> <quotedbl> <Greek_iota>	: "ΐ" U0390 # GREEK SMALL LETTER IOTA WITH DIALYTIKA AND TONOS
 -<dead_diaeresis> <Greek_IOTA>	: "Ϊ" U03AA # GREEK CAPITAL LETTER IOTA WITH DIALYTIKA
 -<Multi_key> <quotedbl> <Greek_IOTA>	: "Ϊ" U03AA # GREEK CAPITAL LETTER IOTA WITH DIALYTIKA
 -<dead_diaeresis> <Greek_UPSILON>	: "Ϋ" U03AB # GREEK CAPITAL LETTER UPSILON WITH DIALYTIKA
@@ -1402,19 +1310,15 @@ Index: libx11/nls/pt_BR.UTF-8/Compose.pre
 -<dead_acute> <Greek_alpha>	: "ά" U03AC # GREEK SMALL LETTER ALPHA WITH TONOS
 -<Multi_key> <acute> <Greek_alpha>	: "ά" U03AC # GREEK SMALL LETTER ALPHA WITH TONOS
 -<Multi_key> <apostrophe> <Greek_alpha>	: "ά" U03AC # GREEK SMALL LETTER ALPHA WITH TONOS
--<combining_acute> <Greek_alpha>	: "ά" U03AC # GREEK SMALL LETTER ALPHA WITH TONOS
 -<dead_acute> <Greek_epsilon>	: "έ" U03AD # GREEK SMALL LETTER EPSILON WITH TONOS
 -<Multi_key> <acute> <Greek_epsilon>	: "έ" U03AD # GREEK SMALL LETTER EPSILON WITH TONOS
 -<Multi_key> <apostrophe> <Greek_epsilon>	: "έ" U03AD # GREEK SMALL LETTER EPSILON WITH TONOS
--<combining_acute> <Greek_epsilon>	: "έ" U03AD # GREEK SMALL LETTER EPSILON WITH TONOS
 -<dead_acute> <Greek_eta>	: "ή" U03AE # GREEK SMALL LETTER ETA WITH TONOS
 -<Multi_key> <acute> <Greek_eta>	: "ή" U03AE # GREEK SMALL LETTER ETA WITH TONOS
 -<Multi_key> <apostrophe> <Greek_eta>	: "ή" U03AE # GREEK SMALL LETTER ETA WITH TONOS
--<combining_acute> <Greek_eta>	: "ή" U03AE # GREEK SMALL LETTER ETA WITH TONOS
 -<dead_acute> <Greek_iota>	: "ί" U03AF # GREEK SMALL LETTER IOTA WITH TONOS
 -<Multi_key> <acute> <Greek_iota>	: "ί" U03AF # GREEK SMALL LETTER IOTA WITH TONOS


Reply to: