xkeyboard-config/rules base.ml_s.part, 1.20, 1.21 base.xml.in, 1.242, 1.243

Committed by: svu

Update of /cvs/xkeyboard-config/xkeyboard-config/rules
In directory kemper:/tmp/cvs-serv18502/rules

Modified Files:
	base.ml_s.part base.xml.in 
Log Message:
sun type6 support, b.fd.o#13664

Index: base.ml_s.part
===================================================================
RCS file: /cvs/xkeyboard-config/xkeyboard-config/rules/base.ml_s.part,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- base.ml_s.part	30 Jan 2008 21:44:24 -0000	1.20
+++ base.ml_s.part	12 Feb 2008 20:34:09 -0000	1.21
@@ -8,9 +8,9 @@
   sun4		*			=	latin+sun_vndr/us(sun4)+%l%(v)
   sun5		$nonlatin		=	latin+sun_vndr/us(sun5)+%l%(v):2
   sun5		*			=	latin+sun_vndr/us(sun5)+%l%(v)
-  sun6		us			=	pc+sun_vndr/us(type6)
-  sun6		en_US			=	pc+sun_vndr/us(type6)+iso9995-3(basic)
-  sun6		*			=	pc+sun_vndr/us(type6)+%l%(v)
+  sun6		us			=	sun_vndr/us(type6)
+  sun6		en_US			=	sun_vndr/us(type6)+iso9995-3(basic)
+  sun6		*			=	sun_vndr/us(type6)+%l%(v)
   pc98		nec_vndr/jp		=	nec_vndr/jp(pc98)
   macintosh_old	us			=	macintosh_vndr/us(oldmac)
   macintosh_old	en_US			=	macintosh_vndr/us(oldmac)

Index: base.xml.in
===================================================================
RCS file: /cvs/xkeyboard-config/xkeyboard-config/rules/base.xml.in,v
retrieving revision 1.242
retrieving revision 1.243
diff -u -d -r1.242 -r1.243
--- base.xml.in	1 Feb 2008 23:59:44 -0000	1.242
+++ base.xml.in	12 Feb 2008 20:34:09 -0000	1.243
@@ -994,6 +994,13 @@
 	<vendor>OLPC</vendor>
       </configItem>
     </model>
+    <model>
+      <configItem>
+        <name>sun6</name>
+        <_description>Sun Type 5/6</_description>
+        <vendor>Sun Microsystems</vendor>
+      </configItem>
+    </model>
   </modelList>
   <layoutList>
     <layout>