From 1d1e50afae7125780b0e9ab388036cf9b0b0f983 Mon Sep 17 00:00:00 2001 From: Thomas Dallmair Date: Sun, 29 Dec 2024 00:27:36 +0100 Subject: [PATCH] Fix build on Trixie, depend on systemd-dev | systemd --- debian/control | 1 + debian/knxd.install.systemd | 6 +++--- debian/rules | 3 ++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/debian/control b/debian/control index 514fb9a1..c8ce100d 100644 --- a/debian/control +++ b/debian/control @@ -8,6 +8,7 @@ Build-Depends: debhelper-compat (=13), libusb-1.0-0-dev (>= 1.0.9), pkgconf | pkg-config, libsystemd-dev (>= 228) | libsystemd-daemon-dev (>= 200) | base-files (<< 8), + systemd-dev | systemd, libev-dev, libfmt-dev | libfmt3-dev | cmake (>= 2.8.12), libfmt-dev | libfmt3-dev | git, diff --git a/debian/knxd.install.systemd b/debian/knxd.install.systemd index 5db984e2..5009d803 100644 --- a/debian/knxd.install.systemd +++ b/debian/knxd.install.systemd @@ -1,5 +1,5 @@ etc/knxd.conf -lib/systemd/system/knxd.service -lib/systemd/system/knxd.socket -lib/systemd/system/knxd-net.socket +${deb_systemdsystemunitdir}/knxd.service +${deb_systemdsystemunitdir}/knxd.socket +${deb_systemdsystemunitdir}/knxd-net.socket usr/lib/sysusers.d diff --git a/debian/rules b/debian/rules index 8cb6c504..2ab9e7a8 100755 --- a/debian/rules +++ b/debian/rules @@ -5,10 +5,11 @@ export DH_VERBOSE=1 export DEB_BUILD_MAINT_OPTIONS=hardening=+all - # This has to be exported to make some magic below work. export DH_OPTIONS +export deb_systemdsystemunitdir = $(shell pkg-config --variable=systemdsystemunitdir systemd | sed s,^/,,) + %: dh $@