From 247c516a7966fe78827f80cf1177f1eaa850e24c Mon Sep 17 00:00:00 2001 From: Laurent Bigonville Date: Thu, 1 Aug 2019 14:59:43 +0200 Subject: [PATCH] debian/rules, debian/control: Override --with-systemdshutdowndir passed to configure to fix FTBFS on non-linux architectures and do not build-depend against systemd --- debian/changelog | 5 ++++- debian/control | 3 +-- debian/rules | 3 ++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 4960981..3265515 100644 --- a/debian/changelog +++ b/debian/changelog @@ -45,8 +45,11 @@ nut (2.7.4-9) UNRELEASED; urgency=medium in libnutclient.pc.in for consistency * debian/patches/0009-fix-nutshutdown-install.patch: Use patch coming from upstream instead of our own patch + * debian/rules, debian/control: Override --with-systemdshutdowndir passed to + configure to fix FTBFS on non-linux architectures and do not build-depend + against systemd - -- Laurent Bigonville Thu, 01 Aug 2019 14:55:56 +0200 + -- Laurent Bigonville Thu, 01 Aug 2019 14:59:17 +0200 nut (2.7.4-8) unstable; urgency=medium diff --git a/debian/control b/debian/control index 2990e70..f6b838d 100644 --- a/debian/control +++ b/debian/control @@ -16,8 +16,7 @@ Build-Depends: debhelper (>= 12), libusb-dev (>= 0.1.8), libwrap0-dev (>= 7.6), python (>= 2.6.6-3~), - python3, - systemd [linux-any] + python3 Build-Depends-Indep: asciidoc (>= 8.6.3), asciidoc-dblatex, dblatex (>= 0.2.5), diff --git a/debian/rules b/debian/rules index 9ed62e9..2534d9b 100755 --- a/debian/rules +++ b/debian/rules @@ -24,7 +24,8 @@ DEB_CONFIGURE_EXTRA_FLAGS := --prefix= \ --datadir=/usr/share/nut \ --with-pkgconfig-dir=/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig \ --with-user=nut --with-group=nut \ - --with-udev-dir=/lib/udev --with-systemdsystemunitdir=/lib/systemd/system + --with-udev-dir=/lib/udev --with-systemdsystemunitdir=/lib/systemd/system \ + --with-systemdshutdowndir=/lib/systemd/system-shutdown # only build documentation if asciidoc is installed ifneq ($(shell which asciidoc),)