Merge remote-tracking branch 'origin/released'

* origin/released:
  libX11 mesa git update 18 Mar 2013
  fontconfig libX11 mesa pixman xserver xkeyboard-config git update 11 Mar 2013

3 files changed, 54 insertions, 54 deletions

diff --git a/libX11/nls/Makefile.am b/libX11/nls/Makefile.am
index 0eced4cd8..53eaacdf6 100644
--- a/libX11/nls/Makefile.am
+++ b/libX11/nls/Makefile.am
@@ -37,8 +37,8 @@ locale.dir: locale.dir.pre
 	cat locale.dir.l2 locale.dir.l1 > locale.dir
 
 if HAVE_PERL
-TESTS_ENVIRONMENT = $(PERL)
-TESTS = $(srcdir)/compose-check.pl
+LOG_COMPILER = $(PERL)
+TESTS = compose-check.pl
 endif HAVE_PERL
 
 
diff --git a/libX11/nls/en_US.UTF-8/Compose.pre b/libX11/nls/en_US.UTF-8/Compose.pre
index de24dadec..8b45d920d 100644
--- a/libX11/nls/en_US.UTF-8/Compose.pre
+++ b/libX11/nls/en_US.UTF-8/Compose.pre
@@ -1481,30 +1481,30 @@ XCOMM Part 3
 <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
 <dead_stroke> <dead_acute> <o>  	: "ǿ"   U01FF # LATIN SMALL LETTER O WITH STROKE AND ACUTE
-<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_doublegrave> <A>                  	: "Ȁ"   U0200 # LATIN CAPITAL LETTER A WITH DOUBLE GRAVE
+<dead_doublegrave> <a>                  	: "ȁ"   U0201 # LATIN SMALL LETTER A WITH DOUBLE GRAVE
+<dead_invertedbreve> <A>                  	: "Ȃ"   U0202 # LATIN CAPITAL LETTER A WITH INVERTED BREVE
+<dead_invertedbreve> <a>                  	: "ȃ"   U0203 # LATIN SMALL LETTER A WITH INVERTED BREVE
+<dead_doublegrave> <E>                  	: "Ȅ"   U0204 # LATIN CAPITAL LETTER E WITH DOUBLE GRAVE
+<dead_doublegrave> <e>                  	: "ȅ"   U0205 # LATIN SMALL LETTER E WITH DOUBLE GRAVE
+<dead_invertedbreve> <E>                  	: "Ȇ"   U0206 # LATIN CAPITAL LETTER E WITH INVERTED BREVE
+<dead_invertedbreve> <e>                  	: "ȇ"   U0207 # LATIN SMALL LETTER E WITH INVERTED BREVE
+<dead_doublegrave> <I>                  	: "Ȉ"   U0208 # LATIN CAPITAL LETTER I WITH DOUBLE GRAVE
+<dead_doublegrave> <i>                  	: "ȉ"   U0209 # LATIN SMALL LETTER I WITH DOUBLE GRAVE
+<dead_invertedbreve> <I>                  	: "Ȋ"   U020A # LATIN CAPITAL LETTER I WITH INVERTED BREVE
+<dead_invertedbreve> <i>                  	: "ȋ"   U020B # LATIN SMALL LETTER I WITH INVERTED BREVE
+<dead_doublegrave> <O>                  	: "Ȍ"   U020C # LATIN CAPITAL LETTER O WITH DOUBLE GRAVE
+<dead_doublegrave> <o>                  	: "ȍ"   U020D # LATIN SMALL LETTER O WITH DOUBLE GRAVE
+<dead_invertedbreve> <O>                  	: "Ȏ"   U020E # LATIN CAPITAL LETTER O WITH INVERTED BREVE
+<dead_invertedbreve> <o>                  	: "ȏ"   U020F # LATIN SMALL LETTER O WITH INVERTED BREVE
+<dead_doublegrave> <R>                  	: "Ȑ"   U0210 # LATIN CAPITAL LETTER R WITH DOUBLE GRAVE
+<dead_doublegrave> <r>                  	: "ȑ"   U0211 # LATIN SMALL LETTER R WITH DOUBLE GRAVE
+<dead_invertedbreve> <R>                  	: "Ȓ"   U0212 # LATIN CAPITAL LETTER R WITH INVERTED BREVE
+<dead_invertedbreve> <r>                  	: "ȓ"   U0213 # LATIN SMALL LETTER R WITH INVERTED BREVE
+<dead_doublegrave> <U>                  	: "Ȕ"   U0214 # LATIN CAPITAL LETTER U WITH DOUBLE GRAVE
+<dead_doublegrave> <u>                  	: "ȕ"   U0215 # LATIN SMALL LETTER U WITH DOUBLE GRAVE
+<dead_invertedbreve> <U>                  	: "Ȗ"   U0216 # LATIN CAPITAL LETTER U WITH INVERTED BREVE
+<dead_invertedbreve> <u>                  	: "ȗ"   U0217 # LATIN SMALL LETTER U WITH INVERTED BREVE
 <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
@@ -1784,8 +1784,8 @@ XCOMM Part 3
 <dead_breve> <Cyrillic_u>        	: "ў"   U045E # CYRILLIC SMALL LETTER SHORT U
 <Multi_key> <U> <Cyrillic_u>     	: "ў"   U045E # CYRILLIC SMALL LETTER SHORT U
 <Multi_key> <b> <Cyrillic_u>     	: "ў"   U045E # CYRILLIC SMALL LETTER SHORT U
-<dead_double_grave> <U0474>          	: "Ѷ"   U0476 # CYRILLIC CAPITAL LETTER IZHITSA WITH DOUBLE GRAVE ACCENT
-<dead_double_grave> <U0475>          	: "ѷ"   U0477 # CYRILLIC SMALL LETTER IZHITSA WITH DOUBLE GRAVE ACCENT
+<dead_doublegrave> <U0474>          	: "Ѷ"   U0476 # CYRILLIC CAPITAL LETTER IZHITSA WITH DOUBLE GRAVE ACCENT
+<dead_doublegrave> <U0475>          	: "ѷ"   U0477 # CYRILLIC SMALL LETTER IZHITSA WITH DOUBLE GRAVE ACCENT
 <Multi_key> <slash> <Cyrillic_GHE> 	: "Ғ"   U0492 # CYRILLIC CAPITAL LETTER GHE WITH STROKE
 <Multi_key> <KP_Divide> <Cyrillic_GHE> 	: "Ғ"   U0492 # CYRILLIC CAPITAL LETTER GHE WITH STROKE
 <Multi_key> <slash> <Cyrillic_ghe> 	: "ғ"   U0493 # CYRILLIC SMALL LETTER GHE WITH STROKE
diff --git a/libX11/nls/pt_BR.UTF-8/Compose.pre b/libX11/nls/pt_BR.UTF-8/Compose.pre
index b6d7c8acc..9e0ca4e42 100644
--- a/libX11/nls/pt_BR.UTF-8/Compose.pre
+++ b/libX11/nls/pt_BR.UTF-8/Compose.pre
@@ -1086,30 +1086,30 @@ XCOMM <Multi_key> <apostrophe> <o> <a>	: "ǻ" U01FB # LATIN SMALL LETTER A WITH
 <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
-<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_doublegrave> <A>	: "Ȁ" U0200 # LATIN CAPITAL LETTER A WITH DOUBLE GRAVE
+<dead_doublegrave> <a>	: "ȁ" U0201 # LATIN SMALL LETTER A WITH DOUBLE GRAVE
+<dead_invertedbreve> <A>	: "Ȃ" U0202 # LATIN CAPITAL LETTER A WITH INVERTED BREVE
+<dead_invertedbreve> <a>	: "ȃ" U0203 # LATIN SMALL LETTER A WITH INVERTED BREVE
+<dead_doublegrave> <E>	: "Ȅ" U0204 # LATIN CAPITAL LETTER E WITH DOUBLE GRAVE
+<dead_doublegrave> <e>	: "ȅ" U0205 # LATIN SMALL LETTER E WITH DOUBLE GRAVE
+<dead_invertedbreve> <E>	: "Ȇ" U0206 # LATIN CAPITAL LETTER E WITH INVERTED BREVE
+<dead_invertedbreve> <e>	: "ȇ" U0207 # LATIN SMALL LETTER E WITH INVERTED BREVE
+<dead_doublegrave> <I>	: "Ȉ" U0208 # LATIN CAPITAL LETTER I WITH DOUBLE GRAVE
+<dead_doublegrave> <i>	: "ȉ" U0209 # LATIN SMALL LETTER I WITH DOUBLE GRAVE
+<dead_invertedbreve> <I>	: "Ȋ" U020A # LATIN CAPITAL LETTER I WITH INVERTED BREVE
+<dead_invertedbreve> <i>	: "ȋ" U020B # LATIN SMALL LETTER I WITH INVERTED BREVE
+<dead_doublegrave> <O>	: "Ȍ" U020C # LATIN CAPITAL LETTER O WITH DOUBLE GRAVE
+<dead_doublegrave> <o>	: "ȍ" U020D # LATIN SMALL LETTER O WITH DOUBLE GRAVE
+<dead_invertedbreve> <O>	: "Ȏ" U020E # LATIN CAPITAL LETTER O WITH INVERTED BREVE
+<dead_invertedbreve> <o>	: "ȏ" U020F # LATIN SMALL LETTER O WITH INVERTED BREVE
+<dead_doublegrave> <R>	: "Ȑ" U0210 # LATIN CAPITAL LETTER R WITH DOUBLE GRAVE
+<dead_doublegrave> <r>	: "ȑ" U0211 # LATIN SMALL LETTER R WITH DOUBLE GRAVE
+<dead_invertedbreve> <R>	: "Ȓ" U0212 # LATIN CAPITAL LETTER R WITH INVERTED BREVE
+<dead_invertedbreve> <r>	: "ȓ" U0213 # LATIN SMALL LETTER R WITH INVERTED BREVE
+<dead_doublegrave> <U>	: "Ȕ" U0214 # LATIN CAPITAL LETTER U WITH DOUBLE GRAVE
+<dead_doublegrave> <u>	: "ȕ" U0215 # LATIN SMALL LETTER U WITH DOUBLE GRAVE
+<dead_invertedbreve> <U>	: "Ȗ" U0216 # LATIN CAPITAL LETTER U WITH INVERTED BREVE
+<dead_invertedbreve> <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
@@ -1371,8 +1371,8 @@ XCOMM <Multi_key> <apostrophe> <o> <a>	: "ǻ" U01FB # LATIN SMALL LETTER A WITH
 <dead_breve> <Cyrillic_u>	: "ў" U045E # CYRILLIC SMALL LETTER SHORT U
 <Multi_key> <U> <Cyrillic_u>	: "ў" U045E # CYRILLIC SMALL LETTER SHORT U
 <Multi_key> <b> <Cyrillic_u>	: "ў" U045E # CYRILLIC SMALL LETTER SHORT U
-<dead_double_grave> <U0474>	: "Ѷ" U0476 # CYRILLIC CAPITAL LETTER IZHITSA WITH DOUBLE GRAVE ACCENT
-<dead_double_grave> <U0475>	: "ѷ" U0477 # CYRILLIC SMALL LETTER IZHITSA WITH DOUBLE GRAVE ACCENT
+<dead_doublegrave> <U0474>	: "Ѷ" U0476 # CYRILLIC CAPITAL LETTER IZHITSA WITH DOUBLE GRAVE ACCENT
+<dead_doublegrave> <U0475>	: "ѷ" U0477 # CYRILLIC SMALL LETTER IZHITSA WITH DOUBLE GRAVE ACCENT
 <Multi_key> <slash> <Cyrillic_GHE>	: "Ғ" U0492 # CYRILLIC CAPITAL LETTER GHE WITH STROKE
 <Multi_key> <KP_Divide> <Cyrillic_GHE>	: "Ғ" U0492 # CYRILLIC CAPITAL LETTER GHE WITH STROKE
 <Multi_key> <slash> <Cyrillic_ghe>	: "ғ" U0493 # CYRILLIC SMALL LETTER GHE WITH STROKE