fontconfig mesa pixman xkeyboard-config git update 12 dev 2012

fontconfig: 9ce36f4bbebc702a35d0cd9f1a59d5b828549bc6
mesa: 621259b3de1f15c879620bbf17764fd8a27ae6f5
pixman: fdab3c1b6cd9c5e197ec3f6bc0a03da32880e317
xkeyboard-config: 378597a9d525f069c049fdd6d04ff628123f82c7

3 files changed, 16 insertions, 2 deletions

diff --git a/xorg-server/xkeyboard-config/rules/base.xml.in b/xorg-server/xkeyboard-config/rules/base.xml.in
index 5f0618166..8d8075004 100644
--- a/xorg-server/xkeyboard-config/rules/base.xml.in
+++ b/xorg-server/xkeyboard-config/rules/base.xml.in
@@ -1598,6 +1598,12 @@
       <variantList>
         <variant>
           <configItem>
+            <name>legacy</name>
+            <_description>German (legacy)</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
             <name>nodeadkeys</name>
             <_description>German (Austria, eliminate dead keys)</_description>
           </configItem>
diff --git a/xorg-server/xkeyboard-config/symbols/de b/xorg-server/xkeyboard-config/symbols/de
index 9793952d6..6ac1e6711 100644
--- a/xorg-server/xkeyboard-config/symbols/de
+++ b/xorg-server/xkeyboard-config/symbols/de
@@ -50,6 +50,16 @@ xkb_symbols "basic" {
 };
 
 partial alphanumeric_keys
+xkb_symbols "legacy" {
+    // previous standard German layout with tilde as dead key
+
+    include "de(basic)"
+    name[Group1]="German (legacy)";
+
+    key <AD12>	{ [      plus,   asterisk,   dead_tilde,  dead_macron ]	};
+};
+
+partial alphanumeric_keys
 xkb_symbols "nodeadkeys" {
 
     // modify the basic German layout to not have any dead keys
diff --git a/xorg-server/xkeyboard-config/symbols/pl b/xorg-server/xkeyboard-config/symbols/pl
index 1fbc6aa04..b769307ce 100644
--- a/xorg-server/xkeyboard-config/symbols/pl
+++ b/xorg-server/xkeyboard-config/symbols/pl
@@ -283,8 +283,6 @@ xkb_symbols "dvp" {
     // home row, right side
     key <AC09> { [ n,            N,              nacute,          Nacute     ] };
     key <AC10> { [ s,            S,              sacute,          Sacute     ] };
-    key <AC11> { [ minus,        underscore,     hyphen                      ], type[Group1] = "FOUR_LEVEL_ALPHABETIC" };
-    key <BKSL> { [ backslash,    bar                                         ] };
 
     // lower row, left side
     key <AB03> { [ j,            J,              doublelowquotemark, rightdoublequotemark ] };