Bug#1058774: cups-filters: use systemd.pc to place systemd system units
Source: cups-filters
Version: 1.28.17-3
Severity: normal
Tags: patch
User: helmutg@debian.org
Usertags: dep17m2
Dear Maintainer,
your package install a systemd system unit, currently into /lib.
This file needs to be moved to /usr/lib as part of Debian's
usr-merge effort [1].
Attached you will find a patch using systemd.pc to place these files
(using pkg-config). This works for unstable today, and also for
bookworm, and is safe to do now.
Later during the trixie cycle I expect this bug class to raise in
priority.
If during the trixie cycle your package will undergo structural
changes or any other file moves, please see the wiki and upload
to experimental first when these changes are done.
Thank you for considering,
Chris
[1] https://wiki.debian.org/UsrMerge
diff -Nru cups-filters-1.28.17/debian/changelog cups-filters-1.28.17/debian/changelog
--- cups-filters-1.28.17/debian/changelog 2023-05-19 18:25:20.000000000 +0200
+++ cups-filters-1.28.17/debian/changelog 2023-12-15 23:49:17.000000000 +0100
@@ -1,3 +1,10 @@
+cups-filters (1.28.17-3.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Let systemd.pc place systemd units. (Closes: #-1)
+
+ -- Chris Hofstaedtler <zeha@debian.org> Fri, 15 Dec 2023 23:49:17 +0100
+
cups-filters (1.28.17-3) unstable; urgency=medium
* CVE-2023-24805
diff -Nru cups-filters-1.28.17/debian/control cups-filters-1.28.17/debian/control
--- cups-filters-1.28.17/debian/control 2023-05-19 10:48:08.000000000 +0200
+++ cups-filters-1.28.17/debian/control 2023-12-15 23:49:04.000000000 +0100
@@ -34,6 +34,7 @@
sharutils,
zlib1g-dev,
libexif-dev,
+ systemd-dev,
Standards-Version: 4.6.0
Vcs-Browser: https://salsa.debian.org/printing-team/cups-filters
Vcs-Git: https://salsa.debian.org/printing-team/cups-filters.git
diff -Nru cups-filters-1.28.17/debian/cups-browsed.install cups-filters-1.28.17/debian/cups-browsed.install
--- cups-filters-1.28.17/debian/cups-browsed.install 2023-05-19 10:48:08.000000000 +0200
+++ cups-filters-1.28.17/debian/cups-browsed.install 2023-12-15 23:49:17.000000000 +0100
@@ -1,4 +1,4 @@
-../../utils/cups-browsed.service lib/systemd/system/
+../../utils/cups-browsed.service ${env:deb_systemdsystemunitdir}/
../apparmor/usr.sbin.cups-browsed etc/apparmor.d/
etc/cups/cups-browsed.conf
usr/lib/cups/backend/implicitclass
diff -Nru cups-filters-1.28.17/debian/rules cups-filters-1.28.17/debian/rules
--- cups-filters-1.28.17/debian/rules 2023-05-19 10:48:08.000000000 +0200
+++ cups-filters-1.28.17/debian/rules 2023-12-15 23:49:17.000000000 +0100
@@ -10,6 +10,8 @@
SUBSTVARS = -Vcf:Recommends="lynx"
endif
+export deb_systemdsystemunitdir = $(shell pkg-config --variable=systemdsystemunitdir systemd | sed s,^/,,)
+
export DEB_BUILD_MAINT_OPTIONS = hardening=+all
%:
Reply to: