From 36ec4b0e0e9e42ef070878c7a3a7435face92a70 Mon Sep 17 00:00:00 2001 From: Laurent Bigonville Date: Fri, 21 Oct 2022 21:07:57 +0200 Subject: [PATCH] Run wrap-and-sort Gbp-Dch: Ignore --- debian/control | 10 +++------- debian/libnutclient-dev.install | 4 ++-- debian/nut-client.install | 2 +- debian/nut-monitor.install | 6 +++--- debian/nut-server.install | 2 +- 5 files changed, 10 insertions(+), 14 deletions(-) diff --git a/debian/control b/debian/control index d774c9d..79ae98c 100644 --- a/debian/control +++ b/debian/control @@ -53,7 +53,7 @@ Depends: adduser, udev [linux-any], ${misc:Depends}, ${shlibs:Depends} -Suggests: nut-cgi, nut-ipmi, nut-snmp, nut-xml, nut-modbus, nut-i2c +Suggests: nut-cgi, nut-i2c, nut-ipmi, nut-modbus, nut-snmp, nut-xml Pre-Depends: ${misc:Pre-Depends} Description: network UPS tools - core system Network UPS Tools (NUT) is a client/server monitoring system that @@ -295,8 +295,7 @@ Description: network UPS tools - development files for the scanner library Package: python3-nut Section: python Architecture: all -Depends: ${python3:Depends}, - ${misc:Depends} +Depends: ${misc:Depends}, ${python3:Depends} Description: network UPS tools - Python3 bindings for NUT server Network UPS Tools (NUT) is a client/server monitoring system that allows computers to share uninterruptible power supply (UPS) and @@ -308,10 +307,7 @@ Description: network UPS tools - Python3 bindings for NUT server Package: nut-monitor Architecture: all -Depends: python3-pyqt5, - python3-nut, - ${python3:Depends}, - ${misc:Depends}, +Depends: python3-nut, python3-pyqt5, ${misc:Depends}, ${python3: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 diff --git a/debian/libnutclient-dev.install b/debian/libnutclient-dev.install index e60e38e..3bda98e 100644 --- a/debian/libnutclient-dev.install +++ b/debian/libnutclient-dev.install @@ -3,7 +3,7 @@ usr/include/nutclientmem.h usr/include/nutscan-serial.h usr/lib/*/libnutclient.a usr/lib/*/libnutclient.so -usr/lib/*/pkgconfig/libnutclient.pc -usr/lib/*/pkgconfig/libnutclientstub.pc usr/lib/*/libnutclientstub.a usr/lib/*/libnutclientstub.so +usr/lib/*/pkgconfig/libnutclient.pc +usr/lib/*/pkgconfig/libnutclientstub.pc diff --git a/debian/nut-client.install b/debian/nut-client.install index 6db3164..60e2451 100644 --- a/debian/nut-client.install +++ b/debian/nut-client.install @@ -7,9 +7,9 @@ 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/lib/systemd/system/nut.target debian/tmp/lib/systemd/system/nut-client.service debian/tmp/lib/systemd/system/nut-monitor.service +debian/tmp/lib/systemd/system/nut.target debian/tmp/lib/systemd/system/ups-monitor.service debian/tmp/sbin/upsmon debian/tmp/sbin/upssched diff --git a/debian/nut-monitor.install b/debian/nut-monitor.install index 74d65f2..5a9b935 100644 --- a/debian/nut-monitor.install +++ b/debian/nut-monitor.install @@ -1,10 +1,10 @@ scripts/python/app/NUT-Monitor-py3qt5 usr/bin/ -scripts/python/app/locale/ usr/share/ scripts/python/app/icons/256x256/nut-monitor.png usr/share/icons/hicolor/256x256/apps/ scripts/python/app/icons/48x48/nut-monitor.png usr/share/icons/hicolor/48x48/apps/ scripts/python/app/icons/64x64/nut-monitor.png usr/share/icons/hicolor/64x64/apps/ scripts/python/app/icons/scalable/nut-monitor.svg usr/share/icons/hicolor/scalable/apps/ +scripts/python/app/locale/ usr/share/ +scripts/python/app/nut-monitor-py3qt5.desktop usr/share/applications/ +scripts/python/app/nut-monitor.appdata.xml usr/share/metainfo/ scripts/python/app/pixmaps usr/share/NUT-Monitor-py3qt5/ scripts/python/app/ui/ usr/share/NUT-Monitor-py3qt5/ -scripts/python/app/nut-monitor.appdata.xml usr/share/metainfo/ -scripts/python/app/nut-monitor-py3qt5.desktop usr/share/applications/ diff --git a/debian/nut-server.install b/debian/nut-server.install index c19cdb7..23b5efc 100644 --- a/debian/nut-server.install +++ b/debian/nut-server.install @@ -64,8 +64,8 @@ debian/tmp/lib/systemd/system/nut-server.service debian/tmp/sbin/upsd debian/tmp/sbin/upsdrvctl debian/tmp/sbin/upsdrvsvcctl +debian/tmp/usr/lib/tmpfiles.d/nut-common.tmpfiles debian/tmp/usr/libexec/nut-driver-enumerator.sh debian/tmp/usr/share/apport/package-hooks/source_nut-server.py debian/tmp/usr/share/nut/cmdvartab debian/tmp/usr/share/nut/driver.list -debian/tmp/usr/lib/tmpfiles.d/nut-common.tmpfiles