xkeyboard-config/rules base.lists.part, 1.39, 1.40 base.m_s.part, 1.7, 1.8 base.xml.in, 1.198, 1.199

Committed by: svu

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

Modified Files:
	base.lists.part base.m_s.part base.xml.in 
Log Message:
consolidating benq models b.fd.o#11713

Index: base.lists.part
===================================================================
RCS file: /cvs/xkeyboard-config/xkeyboard-config/rules/base.lists.part,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- base.lists.part	22 Jul 2007 15:39:32 -0000	1.39
+++ base.lists.part	25 Jul 2007 16:47:34 -0000	1.40
@@ -27,7 +27,7 @@
               acer_c300 acer_ferrari4k acer_tm_800 \
               acpi airkey armada azonaRF2300 \
               apple \
-              benqx730 benqx800 brother \
+              benqx brother \
               btc5113rf btc5126t btc9000 btc9000a btc9001ah btc5090 btc9019u \
               cherryblue cherrybluea cherryblueb cherrycyboard \
               chicony chicony9885 \

Index: base.m_s.part
===================================================================
RCS file: /cvs/xkeyboard-config/xkeyboard-config/rules/base.m_s.part,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- base.m_s.part	18 Sep 2006 13:51:37 -0000	1.7
+++ base.m_s.part	25 Jul 2007 16:47:34 -0000	1.8
@@ -1,3 +1,5 @@
   $inetkbds     =       +inet(%m)
+  benqx730     =       +inet(benqx)
+  benqx800     =       +inet(benqx)
   $maclaptop	=	+inet(apple)+level3(enter_switch)
   $macs	        =	+inet(apple)

Index: base.xml.in
===================================================================
RCS file: /cvs/xkeyboard-config/xkeyboard-config/rules/base.xml.in,v
retrieving revision 1.198
retrieving revision 1.199
diff -u -d -r1.198 -r1.199
--- base.xml.in	24 Jul 2007 15:05:58 -0000	1.198
+++ base.xml.in	25 Jul 2007 16:47:34 -0000	1.199
@@ -931,15 +931,8 @@
     </model>
     <model>
       <configItem>
-	<name>benqx730</name>
-	<_description>BenQ X-Touch 730</_description>
-	<vendor>BenQ</vendor>
-      </configItem>
-    </model>
-    <model>
-      <configItem>
-	<name>benqx800</name>
-	<_description>BenQ X-Touch 800</_description>
+	<name>benqx</name>
+	<_description>BenQ X-Touch</_description>
 	<vendor>BenQ</vendor>
       </configItem>
     </model>