xkbdesc/rules base.lists.part, 1.25, 1.26 base.m_g.part, 1.5, 1.6 base.m_k.part, 1.6, 1.7 base.m_s.part, 1.4, 1.5 base.ml_s.part, 1.7, 1.8 base.xml.in, 1.139, 1.140

Committed by: svu

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

Modified Files:
	base.lists.part base.m_g.part base.m_k.part base.m_s.part 
	base.ml_s.part base.xml.in 
Log Message:
macbook pro stuff

Index: base.lists.part
===================================================================
RCS file: /cvs/xlibs/xkbdesc/rules/base.lists.part,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- base.lists.part	2 Aug 2006 23:16:21 -0000	1.25
+++ base.lists.part	31 Aug 2006 21:44:13 -0000	1.26
@@ -9,8 +9,9 @@
 
 ! $pcgeometries = abnt2 latitude microsoft jp106 kr106
 
-! $maclaptop = ibook powerbook
-! $mac = macintosh macintosh_old ibook powerbook
+! $macbooks = macbook78 macbook79
+! $maclaptop = ibook powerbook macbook78 macbook79
+! $mac = macintosh macintosh_old ibook powerbook macbook78 macbook79
 
 ! $macvendorlayouts = ch de dk es fi fr gb is it nl no pt se us
 
@@ -41,7 +42,7 @@
               microsoftinet microsoftpro microsoftprousb microsoftprooem microsoftprose \
               microsoftoffice microsoftmult \
               oretec \
-              power_g5 propeller silvercrest scorpius \
+              propeller silvercrest scorpius \
               qtronix \
               samsung4500 samsung4510 \
               sk1300 sk2500 sk6200 sk7100 sp_inet \

Index: base.m_g.part
===================================================================
RCS file: /cvs/xlibs/xkbdesc/rules/base.m_g.part,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- base.m_g.part	25 Jun 2006 21:23:53 -0000	1.5
+++ base.m_g.part	31 Aug 2006 21:44:13 -0000	1.6
@@ -11,5 +11,6 @@
   everex	=	everex(STEPnote)
   winbook	=	winbook(XP5)
   pc98		=	nec(pc98)
+ $macbooks      =       macintosh(%m)
  $mac		=	macintosh(macintosh)
   *		=       pc(pc104)

Index: base.m_k.part
===================================================================
RCS file: /cvs/xlibs/xkbdesc/rules/base.m_k.part,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- base.m_k.part	26 Mar 2006 22:16:07 -0000	1.6
+++ base.m_k.part	31 Aug 2006 21:44:13 -0000	1.7
@@ -9,4 +9,6 @@
   abnt2		=	xfree86(abnt2)
   jp106		=	xfree86(jp106)
   evdev		=	evdev
+ $macbooks	=	macintosh(macbook)
+ $mac   	=	macintosh
   *		=	xfree86

Index: base.m_s.part
===================================================================
RCS file: /cvs/xlibs/xkbdesc/rules/base.m_s.part,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- base.m_s.part	11 Jan 2006 22:48:13 -0000	1.4
+++ base.m_s.part	31 Aug 2006 21:44:13 -0000	1.5
@@ -1,2 +1,3 @@
-  $maclaptop	=	+macintosh_vndr/apple(laptop_bad_switch)
   $inetkbds     =       +inet(%m)
+  $maclaptop	=	+inet(apple_laptop)
+  $mac	        =	+inet(apple)

Index: base.ml_s.part
===================================================================
RCS file: /cvs/xlibs/xkbdesc/rules/base.ml_s.part,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- base.ml_s.part	14 Jan 2006 23:49:27 -0000	1.7
+++ base.ml_s.part	31 Aug 2006 21:44:13 -0000	1.8
@@ -13,6 +13,7 @@
   old_macintosh	$macvendorlayouts	=	macintosh_vndr/us(extended)+macintosh_vndr/%l%(v)
   old_macintosh	$nonlatin		=	macintosh_vndr/us(extended)+%l%(v):2
   old_macintosh	*			=	macintosh_vndr/us(extended)+%l%(v)
+ $macbooks	*			=	pc(pc105)+%l%(v)
  $mac		en_US			=	pc(pc105)+macintosh_vndr/us(extended)
  $mac		$macvendorlayouts	=	pc(pc105)+macintosh_vndr/%l%(v)
  $pcmodels      intl   			=       us(%mcompose)

Index: base.xml.in
===================================================================
RCS file: /cvs/xlibs/xkbdesc/rules/base.xml.in,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -d -r1.139 -r1.140
--- base.xml.in	30 Aug 2006 23:47:26 -0000	1.139
+++ base.xml.in	31 Aug 2006 21:44:13 -0000	1.140
@@ -682,6 +682,18 @@
     </model>
     <model>
       <configItem>
+        <name>macbook78</name>
+        <description>MacBook/MacBook Pro</description>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>macbook79</name>
+        <description>MacBook/MacBook Pro (Intl)</description>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
         <name>macintosh</name>
         <_description>Macintosh</_description>
       </configItem>
@@ -718,12 +730,6 @@
     </model>
     <model>
       <configItem>
-        <name>power_g5</name>
-        <_description>Power G5</_description>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
         <name>apple</name>
         <_description>Apple</_description>
       </configItem>