From 1ccf18dc09e288ddf937aa890b50c8d0a9df4319 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Sun, 29 May 2011 15:02:10 +0200
Subject: libX11 mesa mkfontscale pixman xserver git update 29 Mar 2011

---
 xorg-server/xkeyboard-config/rules/base.extras.xml.in | 12 +++++++++++-
 xorg-server/xkeyboard-config/rules/base.xml.in        | 10 ----------
 2 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'xorg-server/xkeyboard-config')

diff --git a/xorg-server/xkeyboard-config/rules/base.extras.xml.in b/xorg-server/xkeyboard-config/rules/base.extras.xml.in
index bbdf8db19..a6b52f0ed 100644
--- a/xorg-server/xkeyboard-config/rules/base.extras.xml.in
+++ b/xorg-server/xkeyboard-config/rules/base.extras.xml.in
@@ -189,6 +189,16 @@
         <languageList><iso639Id>rum</iso639Id></languageList>
       </configItem>
       <variantList>
+        <variant>
+          <configItem>
+            <name>crh_dobruja</name>
+            <_shortDescription>crh</_shortDescription>
+            <_description>Crimean Tatar (Dobruja Q)</_description>
+            <languageList>
+              <iso639Id>crh</iso639Id>
+            </languageList>
+          </configItem>
+        </variant>
         <variant>
           <configItem>
             <name>ergonomic</name>
@@ -252,7 +262,7 @@
         <variant>
           <configItem>
             <name>olpc-phonetic</name>
-            <_description>Armenian (alternative phonetic for OLPC)</_description>
+            <_description>Armenian (OLPC phonetic)</_description>
           </configItem>
         </variant>
       </variantList>
diff --git a/xorg-server/xkeyboard-config/rules/base.xml.in b/xorg-server/xkeyboard-config/rules/base.xml.in
index 33307dd81..9f117cf34 100644
--- a/xorg-server/xkeyboard-config/rules/base.xml.in
+++ b/xorg-server/xkeyboard-config/rules/base.xml.in
@@ -3891,16 +3891,6 @@
             <_description>Romanian (WinKeys)</_description>
           </configItem>
         </variant>
-        <variant>
-          <configItem>
-            <name>crh_dobruja</name>
-            <_shortDescription>crh</_shortDescription>
-            <_description>Crimean Tatar (Dobruja Q)</_description>
-            <languageList>
-              <iso639Id>crh</iso639Id>
-            </languageList>
-          </configItem>
-        </variant>
       </variantList>
     </layout>
     <layout>
-- 
cgit v1.2.3