Imported Upstream version 2.6.2

This commit is contained in:
Arnaud Quette 2011-09-29 20:14:46 +02:00
parent a367d9bc54
commit 45043b58d0
246 changed files with 18228 additions and 1415 deletions

View file

@ -45,6 +45,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ax_compare_version.m4 \
$(top_srcdir)/m4/lt~obsolete.m4 \
$(top_srcdir)/m4/nut_arg_with.m4 \
$(top_srcdir)/m4/nut_check_asciidoc.m4 \
$(top_srcdir)/m4/nut_check_libavahi.m4 \
$(top_srcdir)/m4/nut_check_libfreeipmi.m4 \
$(top_srcdir)/m4/nut_check_libgd.m4 \
$(top_srcdir)/m4/nut_check_libhal.m4 \
$(top_srcdir)/m4/nut_check_libneon.m4 \
@ -134,10 +136,14 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LD = @LD@
LDFLAGS = @LDFLAGS@
LIBAVAHI_CFLAGS = @LIBAVAHI_CFLAGS@
LIBAVAHI_LIBS = @LIBAVAHI_LIBS@
LIBGD_CFLAGS = @LIBGD_CFLAGS@
LIBGD_LDFLAGS = @LIBGD_LDFLAGS@
LIBHAL_CFLAGS = @LIBHAL_CFLAGS@
LIBHAL_LIBS = @LIBHAL_LIBS@
LIBIPMI_CFLAGS = @LIBIPMI_CFLAGS@
LIBIPMI_LIBS = @LIBIPMI_LIBS@
LIBNEON_CFLAGS = @LIBNEON_CFLAGS@
LIBNEON_LIBS = @LIBNEON_LIBS@
LIBNETSNMP_CFLAGS = @LIBNETSNMP_CFLAGS@
@ -175,6 +181,10 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PORT = @PORT@
RANLIB = @RANLIB@
RUN_AS_GROUP = @RUN_AS_GROUP@
RUN_AS_USER = @RUN_AS_USER@
@ -239,6 +249,8 @@ sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
systemdsystemshutdowndir = @systemdsystemshutdowndir@
systemdsystemunitdir = @systemdsystemunitdir@
target = @target@
target_alias = @target_alias@
target_cpu = @target_cpu@

View file

@ -194,6 +194,24 @@
<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">
<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="battery.type" type="string">ups</merge>
</match>
</match>
<!-- Phoenixtec -->
<match key="usb_device.vendor_id" int="0x06da">
@ -255,6 +273,15 @@
<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">
@ -515,6 +542,15 @@
<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">
@ -526,6 +562,15 @@
<merge key="battery.type" type="string">ups</merge>
</match>
</match>
<match key="usb_device.vendor_id" int="0x14f0">
<!-- GE EP series -->
<match key="usb_device.product_id" int="0x00c9">
<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>