Source: colord
Version: 1.4.6-3
Tags: ftbfs patch
User: helm...@debian.org
Usertags: dep17m2
We want to change the value of systemdsystemunitdir in systemd.pc to
point below /usr. colord's upstream build system consumes this variable
while the packaging hard codes its current value. As we change it,
colord will FTBFS. Consider applying the attached patch to avoid this
failure.
Helmut
diff -Nru colord-1.4.6/debian/changelog colord-1.4.6/debian/changelog
--- colord-1.4.6/debian/changelog 2023-09-13 17:07:00.000000000 +0200
+++ colord-1.4.6/debian/changelog 2023-09-27 10:01:53.000000000 +0200
@@ -1,3 +1,10 @@
+colord (1.4.6-3.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix FTBFS when systemd.pc changes systemdsystemunitdir. (Closes: #-1)
+
+ -- Helmut Grohne <hel...@subdivi.de> Wed, 27 Sep 2023 10:01:53 +0200
+
colord (1.4.6-3) unstable; urgency=medium
* Team upload (Closes: #1032263)
diff -Nru colord-1.4.6/debian/colord.install colord-1.4.6/debian/colord.install
--- colord-1.4.6/debian/colord.install 2023-09-13 17:07:00.000000000 +0200
+++ colord-1.4.6/debian/colord.install 2023-09-27 10:00:37.000000000 +0200
@@ -1,5 +1,5 @@
-lib/systemd/system/*.service
-lib/udev/rules.d/
+${env:deb_systemdsystemunitdir}/*.service
+${env:deb_udevdir}/rules.d/
usr/bin/
usr/lib/*/colord-plugins
usr/lib/*/colord-sensors/libcolord_sensor_colorhug.so
diff -Nru colord-1.4.6/debian/control colord-1.4.6/debian/control
--- colord-1.4.6/debian/control 2023-09-13 17:07:00.000000000 +0200
+++ colord-1.4.6/debian/control 2023-09-27 09:57:32.000000000 +0200
@@ -20,9 +20,11 @@
libsystemd-dev [linux-any],
libudev-dev,
meson (>= 0.52.0),
+ pkgconf,
polkitd,
shared-mime-info <!nocheck>,
systemd [linux-any],
+ systemd-dev [linux-any],
valac (>= 0.20),
xsltproc,
Build-Depends-Indep:
diff -Nru colord-1.4.6/debian/rules colord-1.4.6/debian/rules
--- colord-1.4.6/debian/rules 2023-09-13 17:07:00.000000000 +0200
+++ colord-1.4.6/debian/rules 2023-09-27 10:01:46.000000000 +0200
@@ -22,6 +22,8 @@
ifeq ($(DEB_HOST_ARCH_OS),linux)
confflags += -Dsane=true
indep_flags = -Dprint_profiles=true
+ export deb_systemdsystemunitdir = $(shell pkgconf
--variable=systemdsystemunitdir systemd | sed s,^/,,)
+ export deb_udevdir = $(shell pkgconf --variable=udevdir udev | sed
s,^/,,)
else
confflags += -Dsane=false -Dsystemd=false -Dudev_rules=false
indep_flags = -Dprint_profiles=false
@@ -38,8 +40,8 @@
execute_before_dh_install:
# Exclude systemd and udev related files
- grep -E -v 'lib/systemd|lib/udev|lib/tmpfiles\.d' debian/colord.install
> debian/colord.install.kfreebsd
- grep -E -v 'lib/systemd|lib/udev|lib/tmpfiles\.d' debian/colord.install
> debian/colord.install.hurd
+ grep -E -v
'lib/systemd|deb_systemdsystemunitdir|deb_udevdir|lib/tmpfiles\.d'
debian/colord.install > debian/colord.install.kfreebsd
+ grep -E -v
'lib/systemd|deb_systemdsystemunitdir|deb_udevdir|lib/tmpfiles\.d'
debian/colord.install > debian/colord.install.hurd
execute_before_dh_clean:
rm -f debian/colord.install.kfreebsd
