diff --git a/debian/changelog b/debian/changelog index bedfdc1..4968b14 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,11 @@ nut (2.7.2-2) UNRELEASED; urgency=medium * debian/gbp.conf: Switch to debian-jessie branch + * debian/rules: Revert the changes made in the previous NMU, I don't think + that dropping the .service file that late in the release cycle is a good + idea and anyway this was causing left-over files on upgrade. - -- Laurent Bigonville Sun, 25 Jan 2015 12:28:14 +0100 + -- Laurent Bigonville Sun, 25 Jan 2015 12:47:47 +0100 nut (2.7.2-1.1) unstable; urgency=medium diff --git a/debian/rules b/debian/rules index 084af15..b169acd 100755 --- a/debian/rules +++ b/debian/rules @@ -78,9 +78,7 @@ common-install-arch:: $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libupsclient.so # Install systemd files only on systems where it's supported - # disabled in Ubuntu until the unit gets fixed to check nut.conf - # disabled in Debian Jessie to retain sysvinit support until fix is available -ifeq (linux-disabled,$(DEB_HOST_ARCH_OS)) +ifeq (linux,$(DEB_HOST_ARCH_OS)) install -m 644 -D $(CURDIR)/debian/tmp/lib/$(DEB_HOST_MULTIARCH)/systemd/system/nut-monitor.service \ $(CURDIR)/debian/nut-client/lib/systemd/system/nut-monitor.service install -D $(CURDIR)/debian/tmp/lib/$(DEB_HOST_MULTIARCH)/systemd/system-shutdown/nutshutdown \