Source: apticron
Version: 1.2.8
Severity: normal
Tags: patch
User: helm...@debian.org
Usertags: dep17m2

Dear Maintainer,

your package installs systemd system units, currently into /lib.
These files need to be moved to /usr/lib as part of Debian's usr-merge
effort [1].

Attached you will find a patch to delegate the exact placement of
these files to systemd.pc (using pkg-config). This immediately works
in unstable, placing the files into /usr/lib.
It also works for backports to older releases, where it will continue
install into /lib.

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.

Later during the trixie cycle I expect this bug class to raise in
priority.

Thank you for considering,
Chris

[1] https://wiki.debian.org/UsrMerge

>From 637ac22e5191448b93fcbb6952145bd70cdf4f18 Mon Sep 17 00:00:00 2001
From: Chris Hofstaedtler <z...@debian.org>
Date: Sun, 10 Dec 2023 16:05:37 +0100
Subject: Use systemd.pc to place systemd system units

---
 debian/apticron-systemd.install | 4 ++--
 debian/control                  | 2 +-
 debian/rules                    | 1 +
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/debian/apticron-systemd.install b/debian/apticron-systemd.install
index 475d96a..dcd293d 100755
--- a/debian/apticron-systemd.install
+++ b/debian/apticron-systemd.install
@@ -2,5 +2,5 @@
 debian/readme_conf => etc/apticron/README
 apticron => usr/sbin/apticron
 apticron.conf => usr/lib/apticron/apticron.conf
-apticron.service => lib/systemd/system/apticron.service
-apticron.timer => lib/systemd/system/apticron.timer
+apticron.service ${env:deb_systemdsystemunitdir}/
+apticron.timer ${env:deb_systemdsystemunitdir}/
diff --git a/debian/control b/debian/control
index 3f3416b..ce5d70e 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: apticron
 Section: admin
 Priority: optional
 Maintainer: Tiago Bortoletto Vaz <ti...@debian.org>
-Build-Depends: po-debconf, debhelper-compat (= 13), dh-exec
+Build-Depends: po-debconf, debhelper-compat (= 13), dh-exec, pkgconf, systemd-dev
 Standards-Version: 4.6.2
 Vcs-Browser: https://salsa.debian.org/debian/apticron
 Vcs-Git: https://salsa.debian.org/debian/apticron.git
diff --git a/debian/rules b/debian/rules
index 2d33f6a..0f38519 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,4 +1,5 @@
 #!/usr/bin/make -f
+export deb_systemdsystemunitdir = $(shell pkg-config --variable=systemdsystemunitdir systemd | sed s,^/,,)
 
 %:
 	dh $@
-- 
2.39.2

Reply via email to