Merge remote-tracking branch 'glotzi/nut-update' into next

This commit is contained in:
Michael Tremer
2014-05-12 13:49:12 +02:00
3 changed files with 28 additions and 11 deletions

View File

@@ -6,8 +6,10 @@ etc/nut/upsd.users.sample
etc/nut/upsmon.conf.sample
etc/nut/upssched.conf.sample
etc/udev/rules.d/52-nut-usbups.rules
usr/bin/al175
usr/bin/apcsmart
usr/bin/apcsmart-old
usr/bin/apcupsd-ups
usr/bin/bcmxcp
usr/bin/bcmxcp_usb
usr/bin/belkin
@@ -34,14 +36,18 @@ usr/bin/metasys
usr/bin/mge-shut
usr/bin/mge-utalk
usr/bin/microdowell
usr/bin/newmge-shut
usr/bin/nut-scanner
usr/bin/nutdrv_atcl_usb
usr/bin/nutdrv_qx
usr/bin/oldmge-shut
usr/bin/oneac
usr/bin/optiups
usr/bin/powercom
usr/bin/powerpanel
usr/bin/rhino
usr/bin/richcomm_usb
usr/bin/riello_ser
usr/bin/riello_usb
usr/bin/safenet
usr/bin/skel
usr/bin/snmp-ups
@@ -52,14 +58,16 @@ usr/bin/tripplitesu
usr/bin/upsc
usr/bin/upscmd
usr/bin/upscode2
usr/bin/upsdrvctl
usr/bin/upslog
usr/bin/upsrw
usr/bin/upssched-cmd
usr/bin/usbhid-ups
usr/bin/victronups
#usr/cgi-bin
#usr/html
#usr/lib/libnutclient.a
#usr/lib/libnutclient.la
usr/lib/libnutclient.so
usr/lib/libnutclient.so.0
usr/lib/libnutclient.so.0.0.0
#usr/lib/libnutscan.a
#usr/lib/libnutscan.la
usr/lib/libnutscan.so
@@ -68,9 +76,10 @@ usr/lib/libnutscan.so.1.0.0
#usr/lib/libupsclient.a
#usr/lib/libupsclient.la
usr/lib/libupsclient.so
usr/lib/libupsclient.so.1
usr/lib/libupsclient.so.1.1.0
usr/lib/libupsclient.so.4
usr/lib/libupsclient.so.4.0.0
usr/sbin/upsd
usr/sbin/upsdrvctl
usr/sbin/upsmon
usr/sbin/upssched
usr/share/cmdvartab
@@ -81,8 +90,10 @@ usr/share/driver.list
#usr/share/man/man5/upsd.users.5
#usr/share/man/man5/upsmon.conf.5
#usr/share/man/man5/upssched.conf.5
#usr/share/man/man8/al175.8
#usr/share/man/man8/apcsmart-old.8
#usr/share/man/man8/apcsmart.8
#usr/share/man/man8/apcupsd-ups.8
#usr/share/man/man8/bcmxcp.8
#usr/share/man/man8/bcmxcp_usb.8
#usr/share/man/man8/belkin.8
@@ -91,7 +102,8 @@ usr/share/driver.list
#usr/share/man/man8/bestfortress.8
#usr/share/man/man8/bestuferrups.8
#usr/share/man/man8/bestups.8
#usr/share/man/man8/blazer.8
#usr/share/man/man8/blazer_ser.8
#usr/share/man/man8/blazer_usb.8
#usr/share/man/man8/clone.8
#usr/share/man/man8/dummy-ups.8
#usr/share/man/man8/etapro.8
@@ -107,7 +119,10 @@ usr/share/driver.list
#usr/share/man/man8/mge-shut.8
#usr/share/man/man8/mge-utalk.8
#usr/share/man/man8/microdowell.8
#usr/share/man/man8/nut-recorder.8
#usr/share/man/man8/nut-scanner.8
#usr/share/man/man8/nutdrv_atcl_usb.8
#usr/share/man/man8/nutdrv_qx.8
#usr/share/man/man8/nutupsdrv.8
#usr/share/man/man8/oneac.8
#usr/share/man/man8/optiups.8
@@ -115,6 +130,8 @@ usr/share/driver.list
#usr/share/man/man8/powerpanel.8
#usr/share/man/man8/rhino.8
#usr/share/man/man8/richcomm_usb.8
#usr/share/man/man8/riello_ser.8
#usr/share/man/man8/riello_usb.8
#usr/share/man/man8/safenet.8
#usr/share/man/man8/snmp-ups.8
#usr/share/man/man8/solis.8