From 819cab0654a2a599dae96550a120c9a37a6aae29 Mon Sep 17 00:00:00 2001 From: Neil Williams Date: Sat, 17 Jan 2015 10:29:11 +0000 Subject: [PATCH] Imported Debian patch 2.7.2-1.1 --- debian/changelog | 8 ++++++++ debian/rules | 4 +++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index e940af1..f8ba3fa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +nut (2.7.2-1.1) unstable; urgency=medium + + * Non-maintainer upload. + * Port Ubuntu change to drop upstream systemd unit files to allow + sysvinit files for Jessie. (Closes: #747863) + + -- Neil Williams Sat, 17 Jan 2015 10:29:11 +0000 + nut (2.7.2-1) unstable; urgency=low * New upstream release diff --git a/debian/rules b/debian/rules index b169acd..084af15 100755 --- a/debian/rules +++ b/debian/rules @@ -78,7 +78,9 @@ common-install-arch:: $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libupsclient.so # Install systemd files only on systems where it's supported -ifeq (linux,$(DEB_HOST_ARCH_OS)) + # 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)) 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 \