xkbdesc/rules base.m_g.part,1.7,1.8 base.xml.in,1.145,1.146

Committed by: svu

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

Modified Files:
	base.m_g.part base.xml.in 
Log Message:
getting rid of geometry/ibm_vndr, b.fd.o#7990

Index: base.m_g.part
===================================================================
RCS file: /cvs/xlibs/xkbdesc/rules/base.m_g.part,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- base.m_g.part	4 Sep 2006 21:23:22 -0000	1.7
+++ base.m_g.part	5 Sep 2006 22:05:38 -0000	1.8
@@ -3,7 +3,8 @@
   flexpro	=	keytronic(FlexPro)
   hp6000	=	hp(omnibook)
   omnikey101	=	northgate(omnikey101)
-  thinkpad	=	ibm_vndr/thinkpad(common)
+  thinkpad	=	thinkpad(us)
+  thinkpadintl	=	thinkpad(intl)
  $pcmodels	=	pc(%m)
  $pcgeometries	=	pc(%m)
   everex	=	everex(STEPnote)

Index: base.xml.in
===================================================================
RCS file: /cvs/xlibs/xkbdesc/rules/base.xml.in,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -d -r1.145 -r1.146
--- base.xml.in	4 Sep 2006 17:39:23 -0000	1.145
+++ base.xml.in	5 Sep 2006 22:05:38 -0000	1.146
@@ -418,6 +418,12 @@
     </model>
     <model>
       <configItem>
+        <name>thinkpadintl</name>
+        <_description>IBM ThinkPad 560Z/600/600E/A22E, Intl</_description>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
         <name>logiaccess</name>
         <_description>Logitech Access Keyboard</_description>
       </configItem>