Imported Upstream version 2.6.5

This commit is contained in:
Laurent Bigonville 2012-08-12 23:39:31 +02:00
parent fefe62b2bd
commit a1fa151fc7
201 changed files with 7974 additions and 709 deletions

View file

@ -308,6 +308,13 @@
<merge key="info.addons" type="strlist">hald-addon-blazer_usb</merge>
<merge key="battery.type" type="string">ups</merge>
</match>
<!-- Online Zinto A -->
<match key="usb_device.product_id" int="0x0601">
<append key="info.category" type="string">battery</append>
<merge key="info.capabilities" type="strlist">battery</merge>
<merge key="info.addons" type="strlist">hald-addon-blazer_usb</merge>
<merge key="battery.type" type="string">ups</merge>
</match>
<!-- various models -->
<match key="usb_device.product_id" int="0xffff">
<append key="info.category" type="string">battery</append>
@ -585,7 +592,7 @@
<!-- PowerCOM -->
<match key="usb_device.vendor_id" int="0x0d9f">
<!-- PowerCOM BNT-xxxAP -->
<!-- PowerCOM Vanguard and BNT-xxxAP -->
<match key="usb_device.product_id" int="0x0004">
<append key="info.category" type="string">battery</append>
<merge key="info.capabilities" type="strlist">battery</merge>