diff --git a/debian/changelog b/debian/changelog index 17ace90..7356843 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,8 +12,9 @@ nut (2.6.5-1) UNRELEASED; urgency=low * Install systemd .service files (Closes: #679450) * debian/nut-server.install: Drop newmge-shut, renamed upstream to mge-shut and install the old implementation (oldmge-shut) instead + * debian/control: Drop ancient Conflicts/Provides/Replaces - -- Laurent Bigonville Mon, 13 Aug 2012 00:23:00 +0200 + -- Laurent Bigonville Mon, 13 Aug 2012 00:56:42 +0200 nut (2.6.4-2) unstable; urgency=low diff --git a/debian/control b/debian/control index 431767f..7b6c990 100644 --- a/debian/control +++ b/debian/control @@ -41,9 +41,8 @@ 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, nut-dev -Provides: nut-usb -Conflicts: nut-hal-drivers, nut-usb (<< 2.1.0-3), nut-dev (<< 2.2.2) +Suggests: nut-cgi, nut-snmp, nut-ipmi, nut-xml, nut-monitor +Conflicts: nut-hal-drivers Replaces: nut (<< 2.6.1-2~) Breaks: nut (<< 2.6.1-2~) Description: network UPS tools - core system @@ -60,9 +59,9 @@ Package: nut-client Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, lsb-base (>= 3.0-6) Provides: ups-monitor -Conflicts: ups-monitor, nut-server (<< 2.6.3-1) +Conflicts: ups-monitor Recommends: bash-completion -Replaces: nut (<< 2.6.1-2~) +Replaces: ups-monitor, nut (<< 2.6.1-2~), nut-server (<< 2.6.3-1~) 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 @@ -79,7 +78,6 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, adduser Recommends: apache2 | httpd-cgi Suggests: nut -Replaces: nut (<< 1.1.11) Description: network UPS tools - web interface Network UPS Tools (NUT) is a client/server monitoring system that allows computers to share uninterruptible power supply (UPS) and @@ -93,7 +91,6 @@ Description: network UPS tools - web interface Package: nut-snmp Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, nut (>= 1.4.1-pre1) -Conflicts: nut (<= 1.4.0) 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 @@ -108,7 +105,6 @@ Description: network UPS tools - SNMP driver Package: nut-ipmi Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, nut (>= 1.4.1-pre1) -Conflicts: nut (<= 1.4.0) 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 @@ -181,8 +177,6 @@ Package: libupsclient1-dev Section: libdevel Architecture: any Depends: libupsclient1 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} -Provides: nut-dev -Conflicts: nut-dev (<< 2.2.2) 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