moving ge(azerty_tskapo) to fr(geo), b.fd.o#13644

diff --git a/ChangeLog b/ChangeLog
index 83092e5..7110a34 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,10 @@
        * symbols/ro, rules/base.xml.in: small fixes for Romanian visible
        strings from
        https://bugs.freedesktop.org/show_bug.cgi?id=13277
+       * rules/base.xml.in, rules/compat/variantRename.lst, symbols/fr,
+       symbols/ge: moving ge(azerty_tscapo) to fr(geo), since that layout is
+       only used in France, closing
+       https://bugs.freedesktop.org/show_bug.cgi?id=13644
 
 2007-12-31  Sergey Udaltsov
 

diff --git a/rules/base.xml.in b/rules/base.xml.in
index a69edee..c7d2c47 100644 (file)
--- a/rules/base.xml.in
+++ b/rules/base.xml.in
@@ -1987,6 +1987,12 @@
             <_description>Macintosh</_description>
           </configItem>
         </variant>
+        <variant>
+          <configItem>
+            <name>geo</name>
+            <_description>Georgian AZERTY Tskapo</_description>
+          </configItem>
+        </variant>
       </variantList>
     </layout>
     <layout>
@@ -2051,12 +2057,6 @@
       <variantList>
         <variant>
           <configItem>
-            <name>azerty_tskapo</name>
-            <_description>AZERTY Tskapo</_description>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
             <name>ergonomic</name>
             <_description>Ergonomic</_description>
           </configItem>

diff --git a/rules/compat/variantRename.lst b/rules/compat/variantRename.lst
index 6d62270..02c206e 100644 (file)
--- a/rules/compat/variantRename.lst
+++ b/rules/compat/variantRename.lst
@@ -8,6 +8,7 @@ dvorak  pl              pl      dvorak_quotes
 dvorak pl_altquotes    pl      dvorak_altquotes
 dzdwi  basic           bt      basic
 fi     basic           fi      classic
+ge     azerty_tskapo   fr      geo
 guj    basic           in      guj
 gur    basic           in      guru
 ie     laptop          ie      basic

diff --git a/symbols/fr b/symbols/fr
index 163af47..0a01f93 100644 (file)
--- a/symbols/fr
+++ b/symbols/fr
@@ -695,3 +695,63 @@ xkb_symbols "mac" {
     include "level3(ralt_switch)"
 };
 
+partial alphanumeric_keys
+xkb_symbols "geo" {
+    include "ge(basic)"
+
+    name[Group1]= "France - Georgian AZERTY Tskapo";
+
+    key <TLDE> { [ exclam, noSymbol ] };
+    key <AE01> { [ 0x0100201e, 1 ] };
+    key <AE02> { [ 0x01002116, 2 ] };
+    key <AE03> { [ percent, 3    ] };
+    key <AE04> { [ parenleft, 4  ] };
+    key <AE05> { [ colon, 5      ] };
+    key <AE06> { [ semicolon, 6  ] };
+    key <AE07> { [ question, 7   ] };
+    key <AE08> { [ 0x01002116, 8 ] };
+    key <AE09> { [ degree, 9     ] };
+    key <AE10> { [ parenright, 0 ] };
+    key <AE11> { [ minus, underscore, 0x01002014 ] };
+    key <AE12> { [ less, greater ] };
+
+    key <AD01> { [ 0x010010d0,  0x010010fa     ] };
+    key <AD02> { [ 0x010010d6,  Z              ] };
+    key <AD03> { [ 0x010010d4,  E, 0x010010f1  ] };
+    key <AD04> { [ 0x010010e0,  0x010000ae     ] };
+    key <AD05> { [ 0x010010e2,  T              ] };
+    key <AD06> { [ 0x010010e7,  0x010010f8     ] };
+    key <AD07> { [ 0x010010e3,  U              ] };
+    key <AD08> { [ 0x010010d8,  0x010010f2     ] };
+    key <AD09> { [ 0x010010dd,  O              ] };
+    key <AD10> { [ 0x010010de,  P              ] };
+    key <AD11> { [ 0x010010d7,  T              ] };
+    key <AD12> { [ 0x010010eb,  Z              ] };
+
+    key <AC01> { [ 0x010010e5,  Q              ] };
+    key <AC02> { [ 0x010010e1,  S              ] };
+    key <AC03> { [ 0x010010d3,  D              ] };
+    key <AC04> { [ 0x010010e4,  0x010010f6     ] };
+    key <AC05> { [ 0x010010d2,  0x010010f9     ] };
+    key <AC06> { [ 0x010010f0,  0x010010f5     ] };
+    key <AC07> { [ 0x010010ef,  0x010010f7     ] };
+    key <AC08> { [ 0x010010d9,  K              ] };
+    key <AC09> { [ 0x010010da,  L              ] };
+    key <AC10> { [ 0x010010db,  M              ] };
+    key <AC11> { [ 0x010010df,  J              ] };
+    key <BKSL> { [ 0x010010e9,  0x010000a9     ] };
+
+    key <LSGT> { [ guillemotleft,guillemotright ] };
+    key <AB01> { [ 0x010010ec,  W               ] };
+    key <AB02> { [ 0x010010ee,  0x010010f4      ] };
+    key <AB03> { [ 0x010010ea,  0x010000a9      ] };
+    key <AB04> { [ 0x010010d5,  0x010010f3      ] };
+    key <AB05> { [ 0x010010d1,  B               ] };
+    key <AB06> { [ 0x010010dc,  0x010010fc      ] };
+    key <AB07> { [ comma,       0x01002014      ] };
+    key <AB08> { [ 0x010010e8,  S               ] };
+    key <AB09> { [ 0x010010e6,  noSymbol        ] };
+    key <AB10> { [ 0x010010ed,  noSymbol        ] };
+
+};
+

diff --git a/symbols/ge b/symbols/ge
index dcbaffd..6130306 100644 (file)
--- a/symbols/ge
+++ b/symbols/ge
@@ -84,66 +84,6 @@ xkb_symbols "qwerty" {
 };
 
 partial alphanumeric_keys
-xkb_symbols "azerty_tskapo" {
-    include "ge(basic)"
-
-    name[Group1]= "Georgia - AZERTY Tskapo";
-
-    key <TLDE> { [ exclam, noSymbol ] };
-    key <AE01> { [ 0x0100201e, 1 ] };
-    key <AE02> { [ 0x01002116, 2 ] };
-    key <AE03> { [ percent, 3    ] };
-    key <AE04> { [ parenleft, 4  ] };
-    key <AE05> { [ colon, 5      ] };
-    key <AE06> { [ semicolon, 6  ] };
-    key <AE07> { [ question, 7   ] };
-    key <AE08> { [ 0x01002116, 8 ] };
-    key <AE09> { [ degree, 9     ] };
-    key <AE10> { [ parenright, 0 ] };
-    key <AE11> { [ minus, underscore, 0x01002014 ] };
-    key <AE12> { [ less, greater ] };
-
-    key <AD01> { [ 0x010010d0,  0x010010fa     ] };
-    key <AD02> { [ 0x010010d6,  Z              ] };
-    key <AD03> { [ 0x010010d4,  E, 0x010010f1  ] };
-    key <AD04> { [ 0x010010e0,  0x010000ae     ] };
-    key <AD05> { [ 0x010010e2,  T              ] };
-    key <AD06> { [ 0x010010e7,  0x010010f8     ] };
-    key <AD07> { [ 0x010010e3,  U              ] };
-    key <AD08> { [ 0x010010d8,  0x010010f2     ] };
-    key <AD09> { [ 0x010010dd,  O              ] };
-    key <AD10> { [ 0x010010de,  P              ] };
-    key <AD11> { [ 0x010010d7,  T              ] };
-    key <AD12> { [ 0x010010eb,  Z              ] };
-
-    key <AC01> { [ 0x010010e5,  Q              ] };
-    key <AC02> { [ 0x010010e1,  S              ] };
-    key <AC03> { [ 0x010010d3,  D              ] };
-    key <AC04> { [ 0x010010e4,  0x010010f6     ] };
-    key <AC05> { [ 0x010010d2,  0x010010f9     ] };
-    key <AC06> { [ 0x010010f0,  0x010010f5     ] };
-    key <AC07> { [ 0x010010ef,  0x010010f7     ] };
-    key <AC08> { [ 0x010010d9,  K              ] };
-    key <AC09> { [ 0x010010da,  L              ] };
-    key <AC10> { [ 0x010010db,  M              ] };
-    key <AC11> { [ 0x010010df,  J              ] };
-    key <BKSL> { [ 0x010010e9,  0x010000a9     ] };
-
-    key <LSGT> { [ guillemotleft,guillemotright ] };
-    key <AB01> { [ 0x010010ec,  W               ] };
-    key <AB02> { [ 0x010010ee,  0x010010f4      ] };
-    key <AB03> { [ 0x010010ea,  0x010000a9      ] };
-    key <AB04> { [ 0x010010d5,  0x010010f3      ] };
-    key <AB05> { [ 0x010010d1,  B               ] };
-    key <AB06> { [ 0x010010dc,  0x010010fc      ] };
-    key <AB07> { [ comma,       0x01002014      ] };
-    key <AB08> { [ 0x010010e8,  S               ] };
-    key <AB09> { [ 0x010010e6,  noSymbol        ] };
-    key <AB10> { [ 0x010010ed,  noSymbol        ] };
-
-};
-
-partial alphanumeric_keys
 xkb_symbols "ergonomic" {
     include "ge(basic)"