xkbdesc/rules base.o_s.part,1.15,1.16 base.xml.in,1.152,1.153

[Sergey V. Oudaltsov]

Committed by: svu

Update of /cvs/xlibs/xkbdesc/rules
In directory kemper:/tmp/cvs-serv24447/rules

Modified Files:
	base.o_s.part base.xml.in 
Log Message:
new French layouts, b.fd.o#8240

Index: base.o_s.part
===================================================================
RCS file: /cvs/xlibs/xkbdesc/rules/base.o_s.part,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- base.o_s.part	4 Sep 2006 20:47:17 -0000	1.15
+++ base.o_s.part	24 Sep 2006 20:07:00 -0000	1.16
@@ -56,3 +56,5 @@
   eurosign:e		=	+eurosign(e)
   eurosign:5		=	+eurosign(5)
   eurosign:2		=	+eurosign(2)
+  keypad:oss            =       +keypad(oss)
+  keypad:legacy         =	+keypad(legacy)

Index: base.xml.in
===================================================================
RCS file: /cvs/xlibs/xkbdesc/rules/base.xml.in,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -d -r1.152 -r1.153
--- base.xml.in	24 Sep 2006 19:12:34 -0000	1.152
+++ base.xml.in	24 Sep 2006 20:07:00 -0000	1.153
@@ -1504,24 +1504,48 @@
         </variant>
         <variant>
           <configItem>
-            <name>latin9</name>
+            <name>oss</name>
             <_description>Alternative</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
-            <name>latin9_nodeadkeys</name>
+            <name>oss_latin9</name>
+            <_description>Alternative, latin-9 only</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>oss_nodeadkeys</name>
             <_description>Alternative, eliminate dead keys</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
-            <name>latin9_sundeadkeys</name>
+            <name>oss_sundeadkeys</name>
             <_description>Alternative, Sun dead keys</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
+            <name>latin9</name>
+            <_description>(Legacy) Alternative</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>latin9_nodeadkeys</name>
+            <_description>(Legacy) Alternative, eliminate dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>latin9_sundeadkeys</name>
+            <_description>(Legacy) Alternative, Sun dead keys</_description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
             <name>dvorak</name>
             <_description>Dvorak</_description>
           </configItem>