xserver xkeyboard-config mesa git update 4 Marc 2011

5 files changed, 57 insertions, 99 deletions

diff --git a/xorg-server/xkeyboard-config/rules/Makefile.am b/xorg-server/xkeyboard-config/rules/Makefile.am
index 6ca04e7fa..f2d73ce80 100644
--- a/xorg-server/xkeyboard-config/rules/Makefile.am
+++ b/xorg-server/xkeyboard-config/rules/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = bin compat extras
+SUBDIRS = bin compat
 
 if CREATE_RULES_SYMLINK
 #  extra_rules_file = $(xkb_rules_symlink)
@@ -30,16 +30,16 @@ HDR base.l_k.part \
 HDR base.o_k.part \
 HDR base.ml_g.part \
 HDR base.m_g.part \
-HDR compat/base.mlv_s.part   extras/base.mlv_s.part   base.mlv_s.part \
-HDR compat/base.ml_s.part    extras/base.ml_s.part    base.ml_s.part  \
-HDR compat/base.ml1_s.part   extras/base.ml1_s.part   base.ml1_s.part \
-HDR compat/base.ml1v1_s.part extras/base.ml1v1_s.part \
-HDR compat/base.ml2_s.part    extras/base.ml2_s.part    base.ml2_s.part  \
-HDR compat/base.ml3_s.part    extras/base.ml3_s.part    base.ml3_s.part  \
-HDR compat/base.ml4_s.part    extras/base.ml4_s.part    base.ml4_s.part  \
-HDR compat/base.ml2v2_s.part  extras/base.ml2v2_s.part \
-HDR compat/base.ml3v3_s.part  extras/base.ml3v3_s.part \
-HDR compat/base.ml4v4_s.part  extras/base.ml4v4_s.part \
+HDR compat/base.mlv_s.part   base.mlv_s.part \
+HDR compat/base.ml_s.part    base.ml_s.part  \
+HDR compat/base.ml1_s.part   base.ml1_s.part \
+HDR compat/base.ml1v1_s.part \
+HDR compat/base.ml2_s.part    base.ml2_s.part  \
+HDR compat/base.ml3_s.part    base.ml3_s.part  \
+HDR compat/base.ml4_s.part    base.ml4_s.part  \
+HDR compat/base.ml2v2_s.part  \
+HDR compat/base.ml3v3_s.part  \
+HDR compat/base.ml4v4_s.part  \
 HDR base.m_s.part \
 HDR compat/base.lv_c.part   \
 HDR compat/base.l1v1_c.part \
@@ -66,16 +66,16 @@ HDR base.l_k.part \
 HDR base.o_k.part \
 HDR base.ml_g.part \
 HDR base.m_g.part \
-HDR compat/base.mlv_s.part   extras/base.mlv_s.part   base.mlv_s.part \
-HDR compat/base.ml_s.part    extras/base.ml_s.part    base.ml_s.part  \
-HDR compat/base.ml1_s.part   extras/base.ml1_s.part   base.ml1_s.part \
-HDR compat/base.ml1v1_s.part extras/base.ml1v1_s.part \
-HDR compat/base.ml2_s.part    extras/base.ml2_s.part    base.ml2_s.part  \
-HDR compat/base.ml3_s.part    extras/base.ml3_s.part    base.ml3_s.part  \
-HDR compat/base.ml4_s.part    extras/base.ml4_s.part    base.ml4_s.part  \
-HDR compat/base.ml2v2_s.part  extras/base.ml2v2_s.part \
-HDR compat/base.ml3v3_s.part  extras/base.ml3v3_s.part \
-HDR compat/base.ml4v4_s.part  extras/base.ml4v4_s.part \
+HDR compat/base.mlv_s.part   base.mlv_s.part \
+HDR compat/base.ml_s.part    base.ml_s.part  \
+HDR compat/base.ml1_s.part   base.ml1_s.part \
+HDR compat/base.ml1v1_s.part \
+HDR compat/base.ml2_s.part    base.ml2_s.part  \
+HDR compat/base.ml3_s.part    base.ml3_s.part  \
+HDR compat/base.ml4_s.part    base.ml4_s.part  \
+HDR compat/base.ml2v2_s.part  \
+HDR compat/base.ml3v3_s.part  \
+HDR compat/base.ml4v4_s.part  \
 HDR evdev.m_s.part \
 HDR compat/base.lv_c.part   \
 HDR compat/base.l1v1_c.part \
@@ -103,16 +103,16 @@ HDR base.l_k.part \
 HDR \
 HDR base.ml_g.part \
 HDR base.m_g.part \
-HDR extras/base.mlv_s.part   base.mlv_s.part \
-HDR extras/base.ml_s.part    base.ml_s.part  \
-HDR extras/base.ml1_s.part   base.ml1_s.part \
-HDR extras/base.ml1v1_s.part \
-HDR extras/base.ml2_s.part    base.ml2_s.part  \
-HDR extras/base.ml3_s.part    base.ml3_s.part  \
-HDR extras/base.ml4_s.part    base.ml4_s.part  \
-HDR extras/base.ml2v2_s.part \
-HDR extras/base.ml3v3_s.part \
-HDR extras/base.ml4v4_s.part \
+HDR base.mlv_s.part \
+HDR base.ml_s.part  \
+HDR base.ml1_s.part \
+HDR \
+HDR base.ml2_s.part  \
+HDR base.ml3_s.part  \
+HDR base.ml4_s.part  \
+HDR \
+HDR \
+HDR \
 HDR base.m_s.part \
 HDR \
 HDR \
@@ -138,16 +138,16 @@ HDR base.l_k.part  \
 HDR \
 HDR base.ml_g.part \
 HDR base.m_g.part \
-HDR extras/base.mlv_s.part   base.mlv_s.part \
-HDR extras/base.ml_s.part    base.ml_s.part  \
-HDR extras/base.ml1_s.part   base.ml1_s.part \
-HDR extras/base.ml1v1_s.part \
-HDR extras/base.ml2_s.part    base.ml2_s.part  \
-HDR extras/base.ml3_s.part    base.ml3_s.part  \
-HDR extras/base.ml4_s.part    base.ml4_s.part  \
-HDR extras/base.ml2v2_s.part \
-HDR extras/base.ml3v3_s.part \
-HDR extras/base.ml4v4_s.part \
+HDR base.mlv_s.part \
+HDR base.ml_s.part  \
+HDR base.ml1_s.part \
+HDR \
+HDR base.ml2_s.part  \
+HDR base.ml3_s.part  \
+HDR base.ml4_s.part  \
+HDR \
+HDR \
+HDR \
 HDR evdev.m_s.part \
 HDR \
 HDR \
diff --git a/xorg-server/xkeyboard-config/rules/base.extras.xml.in b/xorg-server/xkeyboard-config/rules/base.extras.xml.in
index 7089d049e..b068589fd 100644
--- a/xorg-server/xkeyboard-config/rules/base.extras.xml.in
+++ b/xorg-server/xkeyboard-config/rules/base.extras.xml.in
@@ -67,6 +67,22 @@
     </layout>
     <layout>
       <configItem>
+        <name>ro</name>
+        <_shortDescription>Rou</_shortDescription>
+        <_description>Romania</_description>
+        <languageList><iso639Id>rum</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>ergonomic</name>
+            <_description>Ergonomic Touchtype</_description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+    <layout>
+      <configItem>
         <name>rs</name>
         <_shortDescription>SRB</_shortDescription>
         <_description>Serbia</_description>
diff --git a/xorg-server/xkeyboard-config/rules/extras/Makefile.am b/xorg-server/xkeyboard-config/rules/extras/Makefile.am
deleted file mode 100644
index fafed6033..000000000
--- a/xorg-server/xkeyboard-config/rules/extras/Makefile.am
+++ /dev/null
@@ -1,51 +0,0 @@
-transform_files=layoutsMapping.lst variantsMapping.lst
-
-scripts_dir=$(srcdir)/../bin
-
-scripts= \
-base.ml2_s.part \
-base.ml3_s.part \
-base.ml4_s.part \
-base.ml2v2_s.part \
-base.ml3v3_s.part \
-base.ml4v4_s.part \
-base.ml_s.part \
-base.ml1_s.part \
-base.mlv_s.part \
-base.ml1v1_s.part
-
-noinst_SCRIPTS=$(scripts)
-
-base.ml2_s.part: $(scripts_dir)/mln_s.sh $(transform_files)
-	sh $< 2 $(srcdir)
-
-base.ml3_s.part: $(scripts_dir)/mln_s.sh $(transform_files)
-	sh $< 3 $(srcdir)
-
-base.ml4_s.part: $(scripts_dir)/mln_s.sh $(transform_files)
-	sh $< 4 $(srcdir)
-
-base.ml2v2_s.part: $(scripts_dir)/mlnvn_s.sh $(transform_files)
-	sh $< 2 $(srcdir)
-
-base.ml3v3_s.part: $(scripts_dir)/mlnvn_s.sh $(transform_files)
-	sh $< 3 $(srcdir)
-
-base.ml4v4_s.part: $(scripts_dir)/mlnvn_s.sh $(transform_files)
-	sh $< 4 $(srcdir)
-
-base.ml_s.part: $(scripts_dir)/ml_s.sh $(transform_files)
-	sh $< $(srcdir)
-
-base.ml1_s.part: $(scripts_dir)/ml1_s.sh $(transform_files)
-	sh $< $(srcdir)
-
-base.mlv_s.part: $(scripts_dir)/mlv_s.sh $(transform_files)
-	sh $< $(srcdir)
-
-base.ml1v1_s.part: $(scripts_dir)/ml1v1_s.sh $(transform_files)
-	sh $< $(srcdir)
-
-EXTRA_DIST=$(transform_files)
-
-CLEANFILES=$(scripts)
diff --git a/xorg-server/xkeyboard-config/rules/extras/layoutsMapping.lst b/xorg-server/xkeyboard-config/rules/extras/layoutsMapping.lst
deleted file mode 100644
index d75b4f44d..000000000
--- a/xorg-server/xkeyboard-config/rules/extras/layoutsMapping.lst
+++ /dev/null
@@ -1 +0,0 @@
-apl	extras/apl
diff --git a/xorg-server/xkeyboard-config/rules/extras/variantsMapping.lst b/xorg-server/xkeyboard-config/rules/extras/variantsMapping.lst
deleted file mode 100644
index fd0add719..000000000
--- a/xorg-server/xkeyboard-config/rules/extras/variantsMapping.lst
+++ /dev/null
@@ -1,6 +0,0 @@
-rs	combiningkeys	extras/rs	combiningkeys

-ru	chu		extras/ru	chu

-ir	ave		extras/ir	ave

-us	alt-intl-unicode	extras/us	alt-intl-unicode

-us	crd		extras/us	crd

-us	intl-unicode	extras/us	intl-unicode