lagertonne/nut
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity

debian/rules, debian/control: Override --with-systemdshutdowndir passed to configure to fix FTBFS on non-linux architectures and do not build-depend against systemd

Browse source
This commit is contained in:
Laurent Bigonville 2019-08-01 14:59:43 +02:00
parent 34f0448c77
commit 247c516a79
3 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
debian/changelog vendored
View file

@ -45,8 +45,11 @@ nut (2.7.4-9) UNRELEASED; urgency=medium
in libnutclient.pc.in for consistency in libnutclient.pc.in for consistency
* debian/patches/0009-fix-nutshutdown-install.patch: Use patch coming from * debian/patches/0009-fix-nutshutdown-install.patch: Use patch coming from
upstream instead of our own patch 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 <bigon@debian.org> Thu, 01 Aug 2019 14:55:56 +0200 -- Laurent Bigonville <bigon@debian.org> Thu, 01 Aug 2019 14:59:17 +0200
nut (2.7.4-8) unstable; urgency=medium nut (2.7.4-8) unstable; urgency=medium

3
debian/control vendored
View file

@ -16,8 +16,7 @@ Build-Depends: debhelper (>= 12),
libusb-dev (>= 0.1.8), libusb-dev (>= 0.1.8),
libwrap0-dev (>= 7.6), libwrap0-dev (>= 7.6),
python (>= 2.6.6-3~), python (>= 2.6.6-3~),
python3, python3
systemd [linux-any]
Build-Depends-Indep: asciidoc (>= 8.6.3), Build-Depends-Indep: asciidoc (>= 8.6.3),
asciidoc-dblatex, asciidoc-dblatex,
dblatex (>= 0.2.5), dblatex (>= 0.2.5),

3
debian/rules vendored
View file

@ -24,7 +24,8 @@ DEB_CONFIGURE_EXTRA_FLAGS := --prefix= \
--datadir=/usr/share/nut \ --datadir=/usr/share/nut \
--with-pkgconfig-dir=/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig \ --with-pkgconfig-dir=/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig \
--with-user=nut --with-group=nut \ --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 # only build documentation if asciidoc is installed
ifneq ($(shell which asciidoc),) ifneq ($(shell which asciidoc),)