Merge remote-tracking branch 'origin/released'

* origin/released:
  fontconfig mesa xserver xkeyboard-config git update 21 okt 2013

4 files changed, 33 insertions, 48 deletions

diff --git a/xorg-server/xkeyboard-config/Makefile.am b/xorg-server/xkeyboard-config/Makefile.am
index e0b3168bc..4cc825416 100644
--- a/xorg-server/xkeyboard-config/Makefile.am
+++ b/xorg-server/xkeyboard-config/Makefile.am
@@ -12,7 +12,7 @@ EXTRA_DIST=config.rpath COPYING README \
 
 DISTCLEANFILES=intltool-extract intltool-merge intltool-update
 
-# ACLOCAL_AMFLAGS = -I m4
+ACLOCAL_AMFLAGS = -I m4
 
 sync-po:
 	rsync -Lrtvz translationproject.org::tp/latest/xkeyboard-config/  po
diff --git a/xorg-server/xkeyboard-config/rules/base.xml.in b/xorg-server/xkeyboard-config/rules/base.xml.in
index 874b52eb6..64714675b 100644
--- a/xorg-server/xkeyboard-config/rules/base.xml.in
+++ b/xorg-server/xkeyboard-config/rules/base.xml.in
@@ -2528,10 +2528,11 @@
         </variant>
         <variant>
           <configItem>
-            <name>uig</name>
+            <name>ug</name>
+            <_shortDescription>ug</_shortDescription>
             <_description>Uyghur</_description>
             <languageList>
-              <iso639Id>uig</iso639Id>
+              <iso639Id>ug</iso639Id>
             </languageList>
           </configItem>
         </variant>
@@ -4411,7 +4412,7 @@
         <variant>
           <configItem>
             <name>rue</name>
-            <_description>Pannonian Rusyn (homophonic)</_description>
+            <_description>Pannonian Rusyn</_description>
             <languageList>
               <iso639Id>rue</iso639Id>
             </languageList>
diff --git a/xorg-server/xkeyboard-config/symbols/cn b/xorg-server/xkeyboard-config/symbols/cn
index e6b2c525e..8c2ffe422 100644
--- a/xorg-server/xkeyboard-config/symbols/cn
+++ b/xorg-server/xkeyboard-config/symbols/cn
@@ -149,32 +149,21 @@ xkb_symbols "tib_asciinum" {
     key <AE10> { [ 0, 0x1000f20, 0x1000f08, 0x1000f12 ] }; # 0 ༠ ༈ ༒
 };
 
-// Uyghur Standard Keyboard map for XKB/X.org
+// Uyghur Standard Keyboard Map for XKB/X.Org
 //
-// xkb version originally created by
-// Abdusalam Abdurahman <Abdusalam.Abdurahman@gmail.com>
-// slightly corrected according to feedback and submitted by
+// XKB version in collaboration by Muhemmed Abdullah <muhammad@yulghun.com>,
+// Abdussalam Abdurrahman <abdusalam.abdurahman@gmail.com>, and
 // Ekrem Tomur <ekrem.tomur@gmail.com>
 
-partial alphanumeric_keys 
-xkb_symbols "uig" {
+partial alphanumeric_keys
+xkb_symbols "ug" {
+    include "us(basic)"
 
     name[Group1]= "Uyghur";
 
-    key <TLDE> { [ grave,            asciitilde           ] };
-
-    key <AE01> { [ 1,                exclam               ] };  // 1 !
-    key <AE02> { [ 2,                at                   ] };  // 2 @
-    key <AE03> { [ 3,                numbersign           ] };  // 3 # 
-    key <AE04> { [ 4,                dollar               ] };  // 4 $
-    key <AE05> { [ 5,                percent              ] };  // 5 %
-    key <AE06> { [ 6,                asciicircum          ] };  // 6 ^
-    key <AE07> { [ 7,                ampersand            ] };  // 7 &
-    key <AE08> { [ 8,                asterisk             ] };  // 8 *
     key <AE09> { [ 9,                parenright           ] };  // 9 )
     key <AE10> { [ 0,                parenleft            ] };  // 0 (
     key <AE11> { [ minus,            0x1002014            ] };  // - —
-    key <AE12> { [ equal,            plus                 ] };  // = +
 
     key <AD01> { [ 0x1000686,        VoidSymbol           ] };  // چ
     key <AD02> { [ 0x10006cb,        VoidSymbol           ] };  // ۋ
@@ -199,7 +188,6 @@ xkb_symbols "uig" {
     key <AC08> { [ 0x1000643,        0x10006c6            ] };  // ك ۆ
     key <AC09> { [ 0x1000644,        VoidSymbol           ] };  // ل
     key <AC10> { [ Arabic_semicolon, colon                ] };  // ؛ :
-    key <AC11> { [ apostrophe,	     quotedbl             ] };  // ' "
 
     key <AB01> { [ 0x1000632,        VoidSymbol           ] };  // ز
     key <AB02> { [ 0x1000634,        VoidSymbol           ] };  // ش
@@ -211,6 +199,4 @@ xkb_symbols "uig" {
     key <AB08> { [ Arabic_comma,     0x100203a            ] };  // ، ›
     key <AB09> { [ period,           0x1002039            ] };  // . ‹
     key <AB10> { [ 0x1000626,        Arabic_question_mark ] };  // ئ ؟
-
-    key <BKSL> { [ backslash,        bar                  ] };  // \ |
 };
diff --git a/xorg-server/xkeyboard-config/symbols/rs b/xorg-server/xkeyboard-config/symbols/rs
index 22ff2dae8..86b54632a 100644
--- a/xorg-server/xkeyboard-config/symbols/rs
+++ b/xorg-server/xkeyboard-config/symbols/rs
@@ -300,30 +300,28 @@ xkb_symbols "latinalternatequotes" {
 };
 
 xkb_symbols "rue" {
-  // Homophonic layout for Pannonian Rusyn (spoken mainly in Serbia and
-  // Croatia by the Rusyn people), based on Ukrainian homophonic.
-  // Author: Ljubomir J. Papuga (Любомир Я. Папуґа) <papuga.rs@gmail.com>
-
-  name[Group1]= "Pannonian Rusyn (homophonic)";
-
-  include "ua(homophonic)"
-
-  key <TLDE> { [ grave, asciitilde ] };
-  key <AE03> { [ 3, doublelowquotemark ] };
-  key <AE04> { [ 4, rightdoublequotemark ] };
-  key <AE07> { [ 7, EuroSign ] };
-  key <AE11> { [ 0x002D, emdash ] };
-  key <AE12> { [ equal, plus ] };
-
-  key <AD02> { [ Ukrainian_ie, Ukrainian_IE ] };
-  key <AD06> { [ Cyrillic_yu, Cyrillic_YU ] };
-  key <AD08> { [ Cyrillic_i, Cyrillic_I ] };
-  key <AD11> { [ Cyrillic_sha, Cyrillic_SHA ] };
-  key <AD12> { [ Cyrillic_shcha, Cyrillic_SHCHA ] };
-
-  key <LSGT> { [ Ukrainian_yi, Ukrainian_YI ] };
-  key <AB08> { [ comma, semicolon ] };
-  key <AB09> { [ period, colon ] };
+  // Layout for Pannonian Rusyn (spoken mainly in Serbia and
+  // Croatia by the Rusyn people), based on Serbian Cyrillic layout.
+  // Authors:
+  //   Ljubomir J. Papuga (Любомир Я. Папуґа) <papuga@zoho.com>
+  //   Mihajlo Hornjak <smeceiotpad@gmail.com>
+
+  name[Group1]= "Pannonian Rusyn";
+
+  include "rs(basic)"
+
+  key <TLDE> {   [ Cyrillic_softsign,         Cyrillic_SOFTSIGN         ]   }; // `
+
+  key <AD01> {   [ Cyrillic_ya,               Cyrillic_YA               ]   }; // q
+  key <AD02> {   [ Ukrainian_ie,              Ukrainian_IE              ]   }; // w
+  key <AD12> {   [ Cyrillic_shcha,            Cyrillic_SHCHA            ]   }; // ]
+
+  key <AC05> {   [ Ukrainian_ghe_with_upturn, Ukrainian_GHE_WITH_UPTURN ]   }; // g
+  key <AC07> {   [ Cyrillic_shorti,           Cyrillic_SHORTI           ]   }; // j
+  key <AC11> {   [ Cyrillic_ghe,              Cyrillic_GHE              ]   }; // '
+
+  key <AB01> {   [ Cyrillic_yu,               Cyrillic_YU               ]   }; // z
+  key <AB02> {   [ Ukrainian_yi,              Ukrainian_YI              ]   }; // x
 };
 
 // EXTRAS: