xkeyboard-config/rules base.lists.part, 1.40, 1.41 base.m_s.part, 1.8, 1.9 base.xml.in, 1.199, 1.200
"Sergey V. Oudaltsov" <xlibs-commit-u7BhqnqprCWvj1b/[email protected]>
| Newsgroups | gmane.comp.freedesktop.xlibs.cvs |
|---|---|
| Message-ID | <[email protected]> |
Committed by: svu
Update of /cvs/xkeyboard-config/xkeyboard-config/rules
In directory kemper:/tmp/cvs-serv26105/rules
Modified Files:
base.lists.part base.m_s.part base.xml.in
Log Message:
Serious restructuring in symbols/inet, b.fd.o#11746
Index: base.lists.part
===================================================================
RCS file: /cvs/xkeyboard-config/xkeyboard-config/rules/base.lists.part,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- base.lists.part 25 Jul 2007 16:47:34 -0000 1.40
+++ base.lists.part 30 Jul 2007 16:53:46 -0000 1.41
@@ -24,7 +24,7 @@
! $qwertz = al cz de hr hu ro si sk
! $inetkbds = a4techKB21 a4techKBS8 a4_rfkb23 \
- acer_c300 acer_ferrari4k acer_tm_800 \
+ acer_c300 acer_ferrari4k acer_laptop \
acpi airkey armada azonaRF2300 \
apple \
benqx brother \
@@ -33,16 +33,16 @@
chicony chicony9885 \
compaqeak8 compaqik7 compaqik13 compaqik18 \
cymotionlinux \
- dell inspiron precision_m dellusbmm dtk2000 dell8125 dell8135 \
+ dell inspiron precision_m dellusbmm dtk2000 \
emachines ennyah_dkb1008 evdev \
genius geniuscomfy geniuscomfy2 geniuskb19e \
gyration honeywell_euroboard \
hp2501 hp2505 hp5xx hp500fa hp5181 hp5185 \
hpi6 hpxe3gc hpxe3gf hpxe4xxx hpxt1000 hpzt11xx \
ipaq inspiron latitude \
- logiaccess logicdp logicdpa logicdit logicdo logicink \
- logiex110 logiciink logiclx300 \
- logiinkse logiinkseusb logiitc logiik itouch logiultrax ltcd \
+ logiaccess logicd logicda logicink \
+ logiex110 logiclx300 \
+ logiinkse logiinkseusb logiitc logiik itouch logiultrax \
logitech_g15 \
microsoftinet microsoftpro microsoftprousb microsoftprooem microsoftprose \
microsoftoffice microsoftmult \
Index: base.m_s.part
===================================================================
RCS file: /cvs/xkeyboard-config/xkeyboard-config/rules/base.m_s.part,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- base.m_s.part 25 Jul 2007 16:47:34 -0000 1.8
+++ base.m_s.part 30 Jul 2007 16:53:46 -0000 1.9
@@ -1,5 +1,14 @@
$inetkbds = +inet(%m)
- benqx730 = +inet(benqx)
- benqx800 = +inet(benqx)
- $maclaptop = +inet(apple)+level3(enter_switch)
- $macs = +inet(apple)
+ acer_tm_800 = +inet(acer_laptop)
+ benqx730 = +inet(benqx)
+ benqx800 = +inet(benqx)
+ dell8125 = +inet(dellusbmm)
+ dell8135 = +inet(dellusbmm)
+ ltcd = +inet(logicda)
+ logicdit = +inet(logicd)
+ logicdo = +inet(logicd)
+ logicdp = +inet(logicd)
+ logicdpa = +inet(logicda)
+ logiciink = +inet(logicink)
+ $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.199
retrieving revision 1.200
diff -u -d -r1.199 -r1.200
--- base.xml.in 25 Jul 2007 16:47:34 -0000 1.199
+++ base.xml.in 30 Jul 2007 16:53:46 -0000 1.200
@@ -331,20 +331,6 @@
</model>
<model>
<configItem>
- <name>dell8125</name>
- <_description>Dell SK-8125 USB Multimedia Keybard</_description>
- <vendor>Dell</vendor>
- </configItem>
- </model>
- <model>
- <configItem>
- <name>dell8135</name>
- <_description>Dell SK-8135 USB Multimedia Keybard</_description>
- <vendor>Dell</vendor>
- </configItem>
- </model>
- <model>
- <configItem>
<name>dexxa</name>
<_description>Dexxa Wireless Desktop Keyboard</_description>
<vendor>Dexxa</vendor>
@@ -533,20 +519,6 @@
</model>
<model>
<configItem>
- <name>ltcd</name>
- <_description>Logitech Cordless Desktop</_description>
- <vendor>Logitech</vendor>
- </configItem>
- </model>
- <model>
- <configItem>
- <name>logicdit</name>
- <_description>Logitech Cordless Desktop iTouch</_description>
- <vendor>Logitech</vendor>
- </configItem>
- </model>
- <model>
- <configItem>
<name>logiclx300</name>
<_description>Logitech Cordless Desktop LX-300</_description>
<vendor>Logitech</vendor>
@@ -554,15 +526,15 @@
</model>
<model>
<configItem>
- <name>logicdp</name>
- <_description>Logitech Cordless Desktop Pro</_description>
+ <name>logicd</name>
+ <_description>Logitech Cordless Desktop</_description>
<vendor>Logitech</vendor>
</configItem>
</model>
<model>
<configItem>
- <name>logicdpa</name>
- <_description>Logitech Cordless Desktop Pro (alternate option)</_description>
+ <name>logicda</name>
+ <_description>Logitech Cordless Desktop (alternate option)</_description>
<vendor>Logitech</vendor>
</configItem>
</model>
@@ -575,13 +547,6 @@
</model>
<model>
<configItem>
- <name>logicdo</name>
- <_description>Logitech Cordless Desktop Optical</_description>
- <vendor>Logitech</vendor>
- </configItem>
- </model>
- <model>
- <configItem>
<name>logicfn</name>
<_description>Logitech Cordless Freedom/Desktop Navigator</_description>
<vendor>Logitech</vendor>
@@ -875,15 +840,15 @@
</model>
<model>
<configItem>
- <name>acer_tm_800</name>
- <_description>Acer TravelMate 800</_description>
+ <name>acer_ferrari4k</name>
+ <_description>Acer Ferrari 4000</_description>
<vendor>Acer</vendor>
</configItem>
</model>
<model>
<configItem>
- <name>acer_ferrari4k</name>
- <_description>Acer Ferrari 4000</_description>
+ <name>acer_laptop</name>
+ <_description>Acer Laptop</_description>
<vendor>Acer</vendor>
</configItem>
</model>