Imported Upstream version 2.6.1

This commit is contained in:
Arnaud Quette 2011-06-01 22:31:49 +02:00
parent 459aaf9392
commit a367d9bc54
178 changed files with 4651 additions and 3279 deletions

View file

@ -40,7 +40,6 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(srcdir)/ups-nut-device.fdi.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/ax_compare_version.m4 \
$(top_srcdir)/m4/ax_create_stdint_h.m4 \
$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
$(top_srcdir)/m4/lt~obsolete.m4 \

View file

@ -2,15 +2,6 @@
<deviceinfo version="0.2">
<device>
<match key="@HAL_DEVICE_MATCH_KEY@" string="usb_device">
<match key="usb_device.vendor_id" int="0x0001">
<!-- Krauler UP-M500VA -->
<match key="usb_device.product_id" int="0x0000">
<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>
</match>
<!-- Hewlett Packard -->
<match key="usb_device.vendor_id" int="0x03f0">
@ -195,27 +186,16 @@
<merge key="info.addons" type="strlist">hald-addon-bcmxcp_usb</merge>
<merge key="battery.type" type="string">ups</merge>
</match>
</match>
<match key="usb_device.vendor_id" int="0x05b8">
<!-- Agiler UPS -->
<match key="usb_device.product_id" int="0x0000">
<!-- PW 9140 -->
<match key="usb_device.product_id" int="0x0004">
<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>
</match>
<match key="usb_device.vendor_id" int="0x0665">
<!-- Belkin F6C1200-UNV -->
<match key="usb_device.product_id" int="0x5161">
<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="info.addons" type="strlist">hald-addon-usbhid-ups</merge>
<merge key="battery.type" type="string">ups</merge>
</match>
</match>
<!-- Liebert -->
<!-- Phoenixtec -->
<match key="usb_device.vendor_id" int="0x06da">
<!-- various models -->
<match key="usb_device.product_id" int="0x0002">
@ -275,15 +255,6 @@
<merge key="battery.type" type="string">ups</merge>
</match>
</match>
<match key="usb_device.vendor_id" int="0x0925">
<!-- Sweex 1000VA -->
<match key="usb_device.product_id" int="0x1234">
<append key="info.category" type="string">battery</append>
<merge key="info.capabilities" type="strlist">battery</merge>
<merge key="info.addons" type="strlist">hald-addon-richcomm_usb</merge>
<merge key="battery.type" type="string">ups</merge>
</match>
</match>
<!-- TrippLite -->
<match key="usb_device.vendor_id" int="0x09ae">
@ -544,15 +515,6 @@
<merge key="battery.type" type="string">ups</merge>
</match>
</match>
<match key="usb_device.vendor_id" int="0x0f03">
<!-- Unitek Alpha 1200Sx -->
<match key="usb_device.product_id" int="0x0001">
<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>
</match>
<!-- Liebert -->
<match key="usb_device.vendor_id" int="0x10af">
@ -564,15 +526,6 @@
<merge key="battery.type" type="string">ups</merge>
</match>
</match>
<match key="usb_device.vendor_id" int="0xffff">
<!-- Ablerex 625L USB -->
<match key="usb_device.product_id" int="0x0000">
<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>
</match>
</match>
</device>
</deviceinfo>