xkbdesc/rules base.ml1_s.part,1.8,1.9 base.ml_s.part,1.11,1.12

[Sergey V. Oudaltsov]

Committed by: svu

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

Modified Files:
	base.ml1_s.part base.ml_s.part 
Log Message:
no more old pc symbols, b.fd.o#8321

Index: base.ml1_s.part
===================================================================
RCS file: /cvs/xlibs/xkbdesc/rules/base.ml1_s.part,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- base.ml1_s.part	17 Sep 2006 20:03:34 -0000	1.8
+++ base.ml1_s.part	18 Sep 2006 11:45:12 -0000	1.9
@@ -5,6 +5,5 @@
   macintosh_old	us			=	macintosh_vndr/us(oldmac)
   macintosh_old	$macvendorlayouts	=	macintosh_vndr/us(oldmac)+macintosh_vndr/%l[1]%(v[1])
   macintosh_old	*			=	macintosh_vndr/us(oldmac)+%l[1]%(v[1])
- $macs		$macvendorlayouts	=	pc(pc105)+macintosh_vndr/%l[1]%(v[1])
- $pcmodels	*			=	pc(%m)+%l[1]%(v[1])
-  *		*			=	pc(pc105)+%l[1]%(v[1])
+ $macs		$macvendorlayouts	=	pc+macintosh_vndr/%l[1]%(v[1])
+  *		*			=	pc+%l[1]%(v[1])

Index: base.ml_s.part
===================================================================
RCS file: /cvs/xlibs/xkbdesc/rules/base.ml_s.part,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- base.ml_s.part	17 Sep 2006 20:03:34 -0000	1.11
+++ base.ml_s.part	18 Sep 2006 11:45:12 -0000	1.12
@@ -7,19 +7,15 @@
   sun5		$nonlatin		=	latin+sun_vndr/us(sun5)+%l%(v):2
   sun5		*			=	latin+sun_vndr/us(sun5)+%l%(v)
   pc98		nec_vndr/jp		=	nec_vndr/jp(pc98)
-  abnt2		br			=	pc(pc104)+br
+  abnt2		br			=	pc+br
   macintosh_old	us			=	macintosh_vndr/us(oldmac)
   macintosh_old	en_US			=	macintosh_vndr/us(oldmac)
   macintosh_old	$macvendorlayouts	=	macintosh_vndr/us(oldmac)+macintosh_vndr/%l%(v)
   macintosh_old	$nonlatin		=	macintosh_vndr/us(oldmac)+%l%(v):2
   macintosh_old	*			=	macintosh_vndr/us(oldmac)+%l%(v)
- $macbooks	*			=	pc(pc105)+%l%(v)
- $macs		en_US			=	pc(pc105)+macintosh_vndr/us(extended)
- $macs		$macvendorlayouts	=	pc(pc105)+macintosh_vndr/%l%(v)
- $pcmodels      intl   			=       us(%mcompose)
-  *		intl			=	us(pc104compose)
-  *		jp			=	pc(pc102)+jp(latin)+jp:2
- $pcmodels	$nonlatin		=	pc(%m)+us+%l%(v):2
- $pcmodels	*			=	pc(%m)+%l%(v)
-  *	   	$nonlatin		=	pc(pc105)+us+%l%(v):2
-  *		*			=	pc(pc105)+%l%(v)
+ $macbooks	*			=	pc+%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)