Source: bolt
Version: 0.9.6-1
Severity: normal
Tags: ftbfs patch
User: helm...@debian.org
Usertags: dep17m2

We want to change the systemd unit directory and the udev rules
directory to be below /usr. From a user point of view, nothing changes
as aliasing ensures both locations to be equivalent. However, the bolt
upstream build system looks up the value of systemdsystemunitdir in
systemd.pc and udevdir in udev.pc whereas the packaging hard codes the
current values. When the relevant .pc files change, bolt will FTBFS. I'm
attaching a patch to avoid that.

Helmut
diff -Nru bolt-0.9.6/debian/bolt.install bolt-0.9.6/debian/bolt.install
--- bolt-0.9.6/debian/bolt.install      2023-09-19 19:55:25.000000000 +0200
+++ bolt-0.9.6/debian/bolt.install      2023-09-20 11:51:58.000000000 +0200
@@ -1,5 +1,5 @@
-lib/systemd
-lib/udev
+${env:systemdsystemunitdir}
+${env:udevdir}
 usr/bin
 usr/libexec/boltd
 usr/share
diff -Nru bolt-0.9.6/debian/changelog bolt-0.9.6/debian/changelog
--- bolt-0.9.6/debian/changelog 2023-09-19 19:55:25.000000000 +0200
+++ bolt-0.9.6/debian/changelog 2023-09-20 11:52:04.000000000 +0200
@@ -1,3 +1,11 @@
+bolt (0.9.6-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTBFS when systemdsystemunitdir changes in systemd.pc or udevdir
+    changes in udev.pc. (Closes: #-1)
+
+ -- Helmut Grohne <hel...@subdivi.de>  Wed, 20 Sep 2023 11:52:04 +0200
+
 bolt (0.9.6-1) unstable; urgency=medium
 
   * New upstream bugfix release
diff -Nru bolt-0.9.6/debian/control bolt-0.9.6/debian/control
--- bolt-0.9.6/debian/control   2023-09-19 19:55:25.000000000 +0200
+++ bolt-0.9.6/debian/control   2023-09-20 11:49:57.000000000 +0200
@@ -12,6 +12,7 @@
                libumockdev-dev,
                libxml2-utils <!nodoc>,
                meson,
+               pkgconf,
                python3-dbus <!nocheck>,
                python3-dbusmock <!nocheck>,
                python3-gi <!nocheck>,
diff -Nru bolt-0.9.6/debian/rules bolt-0.9.6/debian/rules
--- bolt-0.9.6/debian/rules     2023-09-19 19:55:25.000000000 +0200
+++ bolt-0.9.6/debian/rules     2023-09-20 11:51:35.000000000 +0200
@@ -3,6 +3,9 @@
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 export DEB_LDFLAGS_MAINT_APPEND = -Wl,-z,defs
 
+export systemdsystemunitdir=$(shell pkgconf --variable=systemdsystemunitdir 
systemd | sed s,^/,,)
+export udevdir=$(shell pkgconf --variable=udevdir udev | sed s,^/,,)
+
 %:
        dh $@
 

Reply via email to