xkbdesc/rules base.ml_s.part,1.13,1.14 base.xml.in,1.158,1.159

Committed by: svu

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

Modified Files:
	base.ml_s.part base.xml.in 
Log Message:
Updating Japanese variants/rules, closing b.fd.o#8503

Index: base.ml_s.part
===================================================================
RCS file: /cvs/xlibs/xkbdesc/rules/base.ml_s.part,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- base.ml_s.part	24 Sep 2006 19:20:23 -0000	1.13
+++ base.ml_s.part	11 Oct 2006 21:12:52 -0000	1.14
@@ -15,6 +15,5 @@
   macintosh_old	*			=	macintosh_vndr/us(oldmac)+%l%(v)
  $macs		en_US			=	pc+macintosh_vndr/us(extended)
  $macs		$macvendorlayouts	=	pc+macintosh_vndr/%l%(v)
-  *		jp			=	pc+jp(latin)+jp:2
   *	   	$nonlatin		=	pc+us+%l%(v):2
   *		*			=	pc+%l%(v)

Index: base.xml.in
===================================================================
RCS file: /cvs/xlibs/xkbdesc/rules/base.xml.in,v
retrieving revision 1.158
retrieving revision 1.159
diff -u -d -r1.158 -r1.159
--- base.xml.in	9 Oct 2006 22:55:20 -0000	1.158
+++ base.xml.in	11 Oct 2006 21:12:52 -0000	1.159
@@ -1953,7 +1953,14 @@
         <_shortDescription>Jpn</_shortDescription>
         <_description>Japan</_description>
       </configItem>
-      <variantList/>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>kana</name>
+            <_description>Kana</_description>
+          </configItem>
+        </variant>
+      </variantList>
     </layout>
     <layout>
       <configItem>