Source: deviceinfo
Version: 0.2.0-1
Tags: ftbfs patch
User: [email protected]
Usertags: dep17m2

We want to change the value of systemdsystemunitdir in systemd.pc to
point below /usr. deviceinfo's upstream build system consumes this
variable while the packaging hard codes its current value. As we change
it, deviceinfo will FTBFS. Consider applying the attached patch to avoid
this failure.

Helmut
diff -Nru deviceinfo-0.2.0/debian/changelog deviceinfo-0.2.0/debian/changelog
--- deviceinfo-0.2.0/debian/changelog   2023-06-11 14:19:45.000000000 +0200
+++ deviceinfo-0.2.0/debian/changelog   2023-09-26 14:53:41.000000000 +0200
@@ -1,3 +1,10 @@
+deviceinfo (0.2.0-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTBFS when systemd.pc changes systemdsystemunitdir. (Closes: #-1)
+
+ -- Helmut Grohne <[email protected]>  Tue, 26 Sep 2023 14:53:41 +0200
+
 deviceinfo (0.2.0-1) unstable; urgency=medium
 
   [ Mike Gabriel ]
diff -Nru deviceinfo-0.2.0/debian/control deviceinfo-0.2.0/debian/control
--- deviceinfo-0.2.0/debian/control     2023-06-11 14:19:38.000000000 +0200
+++ deviceinfo-0.2.0/debian/control     2023-09-26 14:52:31.000000000 +0200
@@ -12,6 +12,7 @@
                libyaml-cpp-dev,
                pkg-config,
                systemd,
+               systemd-dev,
 Maintainer: Debian UBports Team <[email protected]>
 Uploaders: Mike Gabriel <[email protected]>,
 Standards-Version: 4.6.2
diff -Nru deviceinfo-0.2.0/debian/deviceinfo-extras.install 
deviceinfo-0.2.0/debian/deviceinfo-extras.install
--- deviceinfo-0.2.0/debian/deviceinfo-extras.install   2023-06-11 
14:19:31.000000000 +0200
+++ deviceinfo-0.2.0/debian/deviceinfo-extras.install   2023-09-26 
14:53:33.000000000 +0200
@@ -1,2 +1,2 @@
 usr/libexec/update-machine-info-from-deviceinfo
-lib/systemd/system/update-machine-info-from-deviceinfo.service
+${env:deb_systemdsystemunitdir}/update-machine-info-from-deviceinfo.service
diff -Nru deviceinfo-0.2.0/debian/rules deviceinfo-0.2.0/debian/rules
--- deviceinfo-0.2.0/debian/rules       2023-06-11 14:19:31.000000000 +0200
+++ deviceinfo-0.2.0/debian/rules       2023-09-26 14:53:14.000000000 +0200
@@ -5,6 +5,7 @@
 include /usr/share/dpkg/buildflags.mk
 
 export DPKG_GENSYMBOLS_CHECK_LEVEL=1
+export deb_systemdsystemunitdir = $(shell pkg-config 
--variable=systemdsystemunitdir systemd | sed s,^/,,)
 
 %:
        dh $@ --buildsystem cmake

Reply via email to