Run wrap-and-sort

This commit is contained in:
Laurent Bigonville 2016-07-18 17:46:23 +02:00
parent e01f1100e2
commit 5b5df2aac1
13 changed files with 118 additions and 105 deletions

3
debian/changelog vendored
View File

@ -2,8 +2,9 @@ nut (2.7.4-2) UNRELEASED; urgency=medium
* debian/libnutclient0.symbols: Adjust .symbols file for arch specific C++
symbols (Thanks to pkgkde tools)
* Run wrap-and-sort
-- Laurent Bigonville <bigon@debian.org> Mon, 18 Jul 2016 17:40:37 +0200
-- Laurent Bigonville <bigon@debian.org> Mon, 18 Jul 2016 17:46:12 +0200
nut (2.7.4-1) unstable; urgency=low

72
debian/control vendored
View File

@ -3,25 +3,25 @@ Section: admin
Priority: optional
Maintainer: Arnaud Quette <aquette@debian.org>
Uploaders: Laurent Bigonville <bigon@debian.org>
Build-Depends: debhelper (>= 9),
Build-Depends: autotools-dev,
cdbs (>= 0.4.122~),
autotools-dev,
debhelper (>= 9),
dh-autoreconf,
dh-python,
dh-systemd (>= 1.14),
libfreeipmi-dev (>= 0.8.5) [!hurd-i386],
libgd-dev | libgd2-xpm-dev | libgd2-noxpm-dev,
libipmimonitoring-dev (>= 1.1.5-2) [!hurd-i386],
libneon27-gnutls-dev | libneon27-dev,
libnss3-dev,
libpowerman0-dev (>= 2.3.3),
libsnmp-dev | libsnmp9-dev,
libusb-dev (>= 0.1.8),
libneon27-gnutls-dev | libneon27-dev,
libpowerman0-dev (>= 2.3.3),
libwrap0-dev (>= 7.6),
python (>= 2.6.6-3~),
libfreeipmi-dev (>= 0.8.5) [!hurd-i386],
libipmimonitoring-dev (>= 1.1.5-2) [!hurd-i386],
libnss3-dev
python (>= 2.6.6-3~)
Build-Depends-Indep: asciidoc (>= 8.6.3),
docbook-xsl,
dblatex (>= 0.2.5),
docbook-xsl,
libxml2-utils
Standards-Version: 3.9.8
Homepage: http://www.networkupstools.org/
@ -33,7 +33,7 @@ XS-Testsuite: autopkgtest
Package: nut
Architecture: all
Section: metapackages
Depends: ${misc:Depends}, nut-server, nut-client
Depends: nut-client, nut-server, ${misc:Depends}
Description: network UPS tools - metapackage
Network UPS Tools (NUT) is a client/server monitoring system that
allows computers to share uninterruptible power supply (UPS) and
@ -46,8 +46,13 @@ Description: network UPS tools - metapackage
Package: nut-server
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, lsb-base (>= 3.0-6), ${udev}, nut-client (= ${binary:Version})
Suggests: nut-cgi, nut-snmp, nut-ipmi, nut-xml
Depends: adduser,
lsb-base (>= 3.0-6),
nut-client (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends},
${udev}
Suggests: nut-cgi, nut-ipmi, nut-snmp, nut-xml
Conflicts: nut-hal-drivers
Replaces: nut (<< 2.6.1-2~)
Breaks: nut (<< 2.6.1-2~)
@ -63,12 +68,12 @@ Description: network UPS tools - core system
Package: nut-client
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, lsb-base (>= 3.0-6)
Depends: adduser, lsb-base (>= 3.0-6), ${misc:Depends}, ${shlibs:Depends}
Provides: ups-monitor
Conflicts: ups-monitor
Recommends: bash-completion
Suggests: nut-monitor
Replaces: ups-monitor, nut (<< 2.6.1-2~), nut-server (<< 2.6.3-1~)
Replaces: nut (<< 2.6.1-2~), nut-server (<< 2.6.3-1~), ups-monitor
Breaks: nut (<< 2.6.1-2~), nut-server (<< 2.6.3-1~)
Description: network UPS tools - clients
Network UPS Tools (NUT) is a client/server monitoring system that
@ -82,7 +87,7 @@ Description: network UPS tools - clients
Package: nut-cgi
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, adduser
Depends: adduser, ${misc:Depends}, ${shlibs:Depends}
Recommends: apache2 | httpd-cgi
Suggests: nut
Description: network UPS tools - web interface
@ -97,7 +102,7 @@ Description: network UPS tools - web interface
Package: nut-snmp
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, nut (>= 1.4.1-pre1)
Depends: nut (>= 1.4.1-pre1), ${misc:Depends}, ${shlibs:Depends}
Description: network UPS tools - SNMP driver
Network UPS Tools (NUT) is a client/server monitoring system that
allows computers to share uninterruptible power supply (UPS) and
@ -110,8 +115,8 @@ Description: network UPS tools - SNMP driver
Manager interface to the core NUT system.
Package: nut-ipmi
Architecture: linux-any kfreebsd-any
Depends: ${shlibs:Depends}, ${misc:Depends}, nut (>= 1.4.1-pre1)
Architecture: kfreebsd-any linux-any
Depends: nut (>= 1.4.1-pre1), ${misc:Depends}, ${shlibs:Depends}
Description: network UPS tools - IPMI driver
Network UPS Tools (NUT) is a client/server monitoring system that
allows computers to share uninterruptible power supply (UPS) and
@ -125,7 +130,7 @@ Description: network UPS tools - IPMI driver
Package: nut-xml
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, nut (>= 2.2.2)
Depends: nut (>= 2.2.2), ${misc:Depends}, ${shlibs:Depends}
Description: network UPS tools - XML/HTTP driver
Network UPS Tools (NUT) is a client/server monitoring system that
allows computers to share uninterruptible power supply (UPS) and
@ -140,7 +145,10 @@ Description: network UPS tools - XML/HTTP driver
Package: nut-powerman-pdu
Architecture: any
Priority: extra
Depends: ${shlibs:Depends}, ${misc:Depends}, nut (>= 2.4.0), powerman (>= 2.3.3)
Depends: nut (>= 2.4.0),
powerman (>= 2.3.3),
${misc:Depends},
${shlibs:Depends}
Description: network UPS tools - PowerMan PDU driver
Network UPS Tools (NUT) is a client/server monitoring system that
allows computers to share uninterruptible power supply (UPS) and
@ -168,7 +176,7 @@ Description: network UPS tools - documentation
Package: libupsclient4
Section: libs
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Depends: ${misc:Depends}, ${shlibs:Depends}
Pre-Depends: ${misc:Pre-Depends}
Multi-Arch: same
Description: network UPS tools - client library
@ -183,7 +191,9 @@ Description: network UPS tools - client library
Package: libupsclient-dev
Section: libdevel
Architecture: any
Depends: libupsclient4 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
Depends: libupsclient4 (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends}
Conflicts: libupsclient1-dev
Replaces: libupsclient1-dev
Description: network UPS tools - development files
@ -198,7 +208,7 @@ Description: network UPS tools - development files
Package: libnutclient0
Section: libs
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Depends: ${misc:Depends}, ${shlibs:Depends}
Pre-Depends: ${misc:Pre-Depends}
Multi-Arch: same
Description: network UPS tools - new client library
@ -213,7 +223,9 @@ Description: network UPS tools - new client library
Package: libnutclient-dev
Section: libdevel
Architecture: any
Depends: libnutclient0 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
Depends: libnutclient0 (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends}
Description: network UPS tools - development files
Network UPS Tools (NUT) is a client/server monitoring system that
allows computers to share uninterruptible power supply (UPS) and
@ -226,7 +238,7 @@ Description: network UPS tools - development files
Package: python-nut
Section: python
Architecture: all
Depends: ${python:Depends}, ${misc:Depends}
Depends: ${misc:Depends}, ${python:Depends}
Description: network UPS tools - Python bindings for NUT server
Network UPS Tools (NUT) is a client/server monitoring system that
allows computers to share uninterruptible power supply (UPS) and
@ -238,12 +250,12 @@ Description: network UPS tools - Python bindings for NUT server
Package: nut-monitor
Architecture: all
Depends: ${python:Depends},
${misc:Depends},
Depends: python-glade2,
python-gobject,
python-gtk2,
python-glade2,
python-nut
python-nut,
${misc:Depends},
${python:Depends}
Description: network UPS tools - GUI application to monitor UPS status
Network UPS Tools (NUT) is a client/server monitoring system that
allows computers to share uninterruptible power supply (UPS) and
@ -256,7 +268,7 @@ Description: network UPS tools - GUI application to monitor UPS status
Package: libups-nut-perl
Section: perl
Architecture: all
Depends: ${perl:Depends}, ${misc:Depends}
Depends: ${misc:Depends}, ${perl:Depends}
Description: network UPS tools - Perl bindings for NUT server
Network UPS Tools (NUT) is a client/server monitoring system that
allows computers to share uninterruptible power supply (UPS) and

View File

@ -1,4 +1,4 @@
usr/lib/*/libnutclient.so
usr/lib/*/libnutclient.a
usr/lib/*/pkgconfig/libnutclient.pc
usr/include/nutclient.h
usr/lib/*/libnutclient.a
usr/lib/*/libnutclient.so
usr/lib/*/pkgconfig/libnutclient.pc

View File

@ -16,10 +16,10 @@ debian/tmp/usr/share/man/man3/nutclient_get_device_commands.3
debian/tmp/usr/share/man/man3/nutclient_get_device_description.3
debian/tmp/usr/share/man/man3/nutclient_get_device_num_logins.3
debian/tmp/usr/share/man/man3/nutclient_get_device_rw_variables.3
debian/tmp/usr/share/man/man3/nutclient_get_devices.3
debian/tmp/usr/share/man/man3/nutclient_get_device_variable_description.3
debian/tmp/usr/share/man/man3/nutclient_get_device_variables.3
debian/tmp/usr/share/man/man3/nutclient_get_device_variable_values.3
debian/tmp/usr/share/man/man3/nutclient_get_device_variables.3
debian/tmp/usr/share/man/man3/nutclient_get_devices.3
debian/tmp/usr/share/man/man3/nutclient_has_device.3
debian/tmp/usr/share/man/man3/nutclient_has_device_command.3
debian/tmp/usr/share/man/man3/nutclient_has_device_variable.3

View File

@ -1,9 +1,9 @@
usr/lib/*/libupsclient.so
usr/lib/*/libupsclient.a
usr/lib/*/pkgconfig/libupsclient.pc
usr/include/nut-scan.h
usr/include/nutscan-device.h
usr/include/nutscan-init.h
usr/include/nutscan-ip.h
usr/include/parseconf.h
usr/include/upsclient.h
usr/lib/*/libupsclient.a
usr/lib/*/libupsclient.so
usr/lib/*/pkgconfig/libupsclient.pc

View File

@ -1,6 +1,6 @@
debian/tmp/etc/nut/hosts.conf
debian/tmp/etc/nut/upsset.conf
debian/tmp/etc/nut/upsstats.html
debian/tmp/etc/nut/upsstats-single.html
debian/tmp/etc/nut/upsstats.html
debian/tmp/usr/lib/cgi-bin/
debian/tmp/usr/share/nut/www

View File

@ -1,14 +1,14 @@
debian/tmp/bin/upslog
debian/tmp/bin/upsc
debian/tmp/bin/upsrw
debian/tmp/bin/upscmd
debian/tmp/sbin/upsmon
debian/tmp/lib/nut/upsmon
debian/tmp/sbin/upssched
debian/tmp/bin/upslog
debian/tmp/bin/upsrw
debian/tmp/bin/upssched-cmd
debian/tmp/etc/nut/nut.conf
debian/tmp/etc/nut/upsmon.conf
debian/tmp/etc/nut/upssched.conf
debian/tmp/lib/nut/upsmon
debian/tmp/sbin/upsmon
debian/tmp/sbin/upssched
debian/tmp/usr/share/augeas/lenses/dist/nuthostsconf.aug
debian/tmp/usr/share/augeas/lenses/dist/nutnutconf.aug
debian/tmp/usr/share/augeas/lenses/dist/nutupsconf.aug

View File

@ -1,9 +1,9 @@
debian/tmp/usr/share/man/man8/upsc.8
debian/tmp/usr/share/man/man8/upscmd.8
debian/tmp/usr/share/man/man8/upsmon.8
debian/tmp/usr/share/man/man8/upsrw.8
debian/tmp/usr/share/man/man8/upssched.8
debian/tmp/usr/share/man/man5/nut.conf.5
debian/tmp/usr/share/man/man5/upsmon.conf.5
debian/tmp/usr/share/man/man5/upssched.conf.5
debian/tmp/usr/share/man/man8/upsc.8
debian/tmp/usr/share/man/man8/upscmd.8
debian/tmp/usr/share/man/man8/upslog.8
debian/tmp/usr/share/man/man8/upsmon.8
debian/tmp/usr/share/man/man8/upsrw.8
debian/tmp/usr/share/man/man8/upssched.8

View File

@ -1,2 +1,2 @@
debian/tmp/lib/nut/nut-ipmipsu
debian/tmp/*/udev/rules.d/52-nut-ipmipsu.rules
debian/tmp/lib/nut/nut-ipmipsu

View File

@ -1,6 +1,6 @@
scripts/python/app/NUT-Monitor usr/bin/
scripts/python/app/nut-monitor.desktop usr/share/applications/
scripts/python/app/gui-*.glade usr/share/nut-monitor/
scripts/python/app/locale/ usr/share/
scripts/python/app/nut-monitor.desktop usr/share/applications/
scripts/python/app/nut-monitor.png usr/share/pixmaps/
scripts/python/app/pixmaps usr/share/nut-monitor/

View File

@ -1,59 +1,59 @@
debian/tmp/sbin/upsd
debian/tmp/lib/nut/upsd
debian/tmp/sbin/upsdrvctl
debian/tmp/usr/share/nut/cmdvartab
debian/tmp/usr/share/nut/driver.list
debian/tmp/*/udev/rules.d/62-nut-usbups.rules
debian/tmp/etc/avahi/services/nut.service
debian/tmp/etc/nut/ups.conf
debian/tmp/etc/nut/upsd.conf
debian/tmp/etc/nut/upsd.users
debian/tmp/lib/nut/genericups
debian/tmp/lib/nut/mge-shut
debian/tmp/lib/nut/rhino
debian/tmp/lib/nut/bestups
debian/tmp/lib/nut/bestfortress
debian/tmp/lib/nut/usbhid-ups
debian/tmp/lib/nut/al175
debian/tmp/lib/nut/apcsmart
debian/tmp/lib/nut/apcsmart-old
debian/tmp/lib/nut/apcupsd-ups
debian/tmp/lib/nut/bcmxcp
debian/tmp/lib/nut/bcmxcp_usb
debian/tmp/lib/nut/belkin
debian/tmp/lib/nut/belkinunv
debian/tmp/lib/nut/bestfcom
debian/tmp/lib/nut/bestfortress
debian/tmp/lib/nut/bestuferrups
debian/tmp/lib/nut/bestups
debian/tmp/lib/nut/blazer_ser
debian/tmp/lib/nut/blazer_usb
debian/tmp/lib/nut/clone
debian/tmp/lib/nut/clone-outlet
debian/tmp/lib/nut/ivtscd
debian/tmp/lib/nut/metasys
debian/tmp/lib/nut/etapro
debian/tmp/lib/nut/tripplite_usb
debian/tmp/lib/nut/bcmxcp
debian/tmp/lib/nut/bestuferrups
debian/tmp/lib/nut/gamatronic
debian/tmp/lib/nut/oldmge-shut
debian/tmp/lib/nut/safenet
debian/tmp/lib/nut/isbmex
debian/tmp/lib/nut/masterguard
debian/tmp/lib/nut/belkinunv
debian/tmp/lib/nut/tripplite
debian/tmp/lib/nut/upscode2
debian/tmp/lib/nut/solis
debian/tmp/lib/nut/oneac
debian/tmp/lib/nut/mge-utalk
debian/tmp/lib/nut/powerpanel
debian/tmp/lib/nut/bestfcom
debian/tmp/lib/nut/liebert
debian/tmp/lib/nut/powercom
debian/tmp/lib/nut/bcmxcp_usb
debian/tmp/lib/nut/victronups
debian/tmp/lib/nut/tripplitesu
debian/tmp/lib/nut/optiups
debian/tmp/lib/nut/everups
debian/tmp/lib/nut/dummy-ups
debian/tmp/lib/nut/richcomm_usb
debian/tmp/lib/nut/etapro
debian/tmp/lib/nut/everups
debian/tmp/lib/nut/gamatronic
debian/tmp/lib/nut/genericups
debian/tmp/lib/nut/isbmex
debian/tmp/lib/nut/ivtscd
debian/tmp/lib/nut/liebert
debian/tmp/lib/nut/liebert-esp2
debian/tmp/lib/nut/masterguard
debian/tmp/lib/nut/metasys
debian/tmp/lib/nut/mge-shut
debian/tmp/lib/nut/mge-utalk
debian/tmp/lib/nut/microdowell
debian/tmp/lib/nut/al175
debian/tmp/lib/nut/apcupsd-ups
debian/tmp/lib/nut/nutdrv_atcl_usb
debian/tmp/lib/nut/nutdrv_qx
debian/tmp/lib/nut/oldmge-shut
debian/tmp/lib/nut/oneac
debian/tmp/lib/nut/optiups
debian/tmp/lib/nut/powercom
debian/tmp/lib/nut/powerpanel
debian/tmp/lib/nut/rhino
debian/tmp/lib/nut/richcomm_usb
debian/tmp/lib/nut/riello_ser
debian/tmp/lib/nut/riello_usb
debian/tmp/lib/nut/safenet
debian/tmp/lib/nut/solis
debian/tmp/lib/nut/tripplite
debian/tmp/lib/nut/tripplite_usb
debian/tmp/lib/nut/tripplitesu
debian/tmp/lib/nut/upscode2
debian/tmp/lib/nut/upsd
debian/tmp/lib/nut/usbhid-ups
debian/tmp/lib/nut/victronups
debian/tmp/sbin/upsd
debian/tmp/sbin/upsdrvctl
debian/tmp/usr/share/nut/cmdvartab
debian/tmp/usr/share/nut/driver.list

View File

@ -1,16 +1,20 @@
debian/tmp/usr/share/man/man5/ups.conf.5
debian/tmp/usr/share/man/man5/upsd.conf.5
debian/tmp/usr/share/man/man5/upsd.users.5
debian/tmp/usr/share/man/man8/apcsmart.8
debian/tmp/usr/share/man/man8/al175.8
debian/tmp/usr/share/man/man8/apcsmart-old.8
debian/tmp/usr/share/man/man8/apcsmart.8
debian/tmp/usr/share/man/man8/apcupsd-ups.8
debian/tmp/usr/share/man/man8/bcmxcp.8
debian/tmp/usr/share/man/man8/bcmxcp_usb.8
debian/tmp/usr/share/man/man8/belkin.8
debian/tmp/usr/share/man/man8/belkinunv.8
debian/tmp/usr/share/man/man8/bestfcom.8
debian/tmp/usr/share/man/man8/bestfortress.8
debian/tmp/usr/share/man/man8/bestuferrups.8
debian/tmp/usr/share/man/man8/bestups.8
debian/tmp/usr/share/man/man8/bestfortress.8
debian/tmp/usr/share/man/man8/blazer_ser.8
debian/tmp/usr/share/man/man8/blazer_usb.8
debian/tmp/usr/share/man/man8/clone.8
debian/tmp/usr/share/man/man8/dummy-ups.8
debian/tmp/usr/share/man/man8/etapro.8
@ -19,13 +23,15 @@ debian/tmp/usr/share/man/man8/gamatronic.8
debian/tmp/usr/share/man/man8/genericups.8
debian/tmp/usr/share/man/man8/isbmex.8
debian/tmp/usr/share/man/man8/ivtscd.8
debian/tmp/usr/share/man/man8/liebert.8
debian/tmp/usr/share/man/man8/liebert-esp2.8
debian/tmp/usr/share/man/man8/liebert.8
debian/tmp/usr/share/man/man8/masterguard.8
debian/tmp/usr/share/man/man8/metasys.8
debian/tmp/usr/share/man/man8/mge-shut.8
debian/tmp/usr/share/man/man8/mge-utalk.8
debian/tmp/usr/share/man/man8/microdowell.8
debian/tmp/usr/share/man/man8/nutdrv_atcl_usb.8
debian/tmp/usr/share/man/man8/nutdrv_qx.8
debian/tmp/usr/share/man/man8/nutupsdrv.8
debian/tmp/usr/share/man/man8/oneac.8
debian/tmp/usr/share/man/man8/optiups.8
@ -33,21 +39,15 @@ debian/tmp/usr/share/man/man8/powercom.8
debian/tmp/usr/share/man/man8/powerpanel.8
debian/tmp/usr/share/man/man8/rhino.8
debian/tmp/usr/share/man/man8/richcomm_usb.8
debian/tmp/usr/share/man/man8/riello_ser.8
debian/tmp/usr/share/man/man8/riello_usb.8
debian/tmp/usr/share/man/man8/safenet.8
debian/tmp/usr/share/man/man8/solis.8
debian/tmp/usr/share/man/man8/tripplite.8
debian/tmp/usr/share/man/man8/tripplitesu.8
debian/tmp/usr/share/man/man8/tripplite_usb.8
debian/tmp/usr/share/man/man8/tripplitesu.8
debian/tmp/usr/share/man/man8/upscode2.8
debian/tmp/usr/share/man/man8/upsd.8
debian/tmp/usr/share/man/man8/upsdrvctl.8
debian/tmp/usr/share/man/man8/usbhid-ups.8
debian/tmp/usr/share/man/man8/victronups.8
debian/tmp/usr/share/man/man8/al175.8
debian/tmp/usr/share/man/man8/apcupsd-ups.8
debian/tmp/usr/share/man/man8/blazer_ser.8
debian/tmp/usr/share/man/man8/blazer_usb.8
debian/tmp/usr/share/man/man8/nutdrv_atcl_usb.8
debian/tmp/usr/share/man/man8/nutdrv_qx.8
debian/tmp/usr/share/man/man8/riello_ser.8
debian/tmp/usr/share/man/man8/riello_usb.8

2
debian/nut.docs vendored
View File

@ -2,11 +2,11 @@ AUTHORS
MAINTAINERS
README
UPGRADING
docs/FAQ.txt
docs/acknowledgements.txt
docs/config-notes.txt
docs/documentation.txt
docs/download.txt
docs/FAQ.txt
docs/features.txt
docs/history.txt
docs/nut-names.txt