Do not use dpkg-maintscript-helper to remove /etc/init.d/nut

This commit is contained in:
Laurent Bigonville 2012-08-11 17:21:01 +02:00
parent 062e200fee
commit 00ffc53caa
4 changed files with 7 additions and 6 deletions

2
debian/changelog vendored
View file

@ -2,7 +2,7 @@ nut (2.6.4-2) UNRELEASED; urgency=low
* debian/rules: Stop the nut-client before nut-server on systems using static * debian/rules: Stop the nut-client before nut-server on systems using static
boot ordering (Closes: #679451) boot ordering (Closes: #679451)
* debian/nut-server.maintscript: Remove /etc/init.d/nut on upgrade * debian/nut-server.postinst: Remove /etc/init.d/nut on upgrade
(Closes: #677822) (Closes: #677822)
* Rename nut-server.lintian-overrides to nut-client.lintian-overrides and * Rename nut-server.lintian-overrides to nut-client.lintian-overrides and
adjust overrides now that ups-monitor is shipped in nut-client package adjust overrides now that ups-monitor is shipped in nut-client package

3
debian/control vendored
View file

@ -3,7 +3,7 @@ Section: admin
Priority: optional Priority: optional
Maintainer: Arnaud Quette <aquette@debian.org> Maintainer: Arnaud Quette <aquette@debian.org>
Uploaders: Laurent Bigonville <bigon@debian.org> Uploaders: Laurent Bigonville <bigon@debian.org>
Build-Depends: debhelper (>= 8.1.0~), Build-Depends: debhelper (>= 8),
cdbs (>= 0.4.90~), cdbs (>= 0.4.90~),
libgd2-xpm-dev | libgd2-noxpm-dev, libgd2-xpm-dev | libgd2-noxpm-dev,
libsnmp-dev | libsnmp9-dev, libsnmp-dev | libsnmp9-dev,
@ -43,7 +43,6 @@ Provides: nut-usb
Conflicts: nut-hal-drivers, nut-usb (<< 2.1.0-3), nut-dev (<< 2.2.2) Conflicts: nut-hal-drivers, nut-usb (<< 2.1.0-3), nut-dev (<< 2.2.2)
Replaces: nut (<< 2.6.1-2~) Replaces: nut (<< 2.6.1-2~)
Breaks: nut (<< 2.6.1-2~) Breaks: nut (<< 2.6.1-2~)
Pre-Depends: ${misc:Pre-Depends}
Description: network UPS tools - core system Description: network UPS tools - core system
Network UPS Tools (NUT) is a client/server monitoring system that Network UPS Tools (NUT) is a client/server monitoring system that
allows computers to share uninterruptible power supply (UPS) and allows computers to share uninterruptible power supply (UPS) and

View file

@ -1,3 +0,0 @@
#Removing obsolete init script.
#The file is gone in 2.6.3-2 but was not removed on upgrades.
rm_conffile /etc/init.d/nut 2.6.4-3~

View file

@ -49,6 +49,11 @@ case "$1" in
&& udevadm trigger --subsystem-match=usb --action=change && udevadm trigger --subsystem-match=usb --action=change
# 557178 udevadm trigger --subsystem-match=usb # 557178 udevadm trigger --subsystem-match=usb
if dpkg --compare-versions "$2" le "2.6.4-2~" ; then
rm -f /etc/init.d/nut
update-rc.d nut remove >/dev/null
fi
;; ;;
abort-upgrade) abort-upgrade)