Source: connman
Version: 1.42-3
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.
Patch as salsa merge request:
https://salsa.debian.org/debian/connman/-/merge_requests/11
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 e77c570d0b3a8d0296f786a2a6a6c8ce1484f90f Mon Sep 17 00:00:00 2001
From: Chris Hofstaedtler <z...@debian.org>
Date: Sun, 10 Dec 2023 16:29:30 +0100
Subject: [PATCH] Use systemd.pc to place systemd system unit files
---
debian/connman-vpn.install | 2 +-
debian/connman.install | 4 ++--
debian/control | 4 +++-
debian/rules | 3 ++-
4 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/debian/connman-vpn.install b/debian/connman-vpn.install
index a68dc6b8..24a2a567 100644
--- a/debian/connman-vpn.install
+++ b/debian/connman-vpn.install
@@ -1,6 +1,6 @@
usr/share/dbus-1/system.d/connman-vpn-dbus.conf
-lib/systemd/system/connman-vpn.service
+${env:deb_systemdsystemunitdir}/connman-vpn.service
usr/share/polkit-1/actions/net.connman.vpn.policy
usr/lib/*/connman/scripts/vpn-script
usr/share/dbus-1/system-services/net.connman.vpn.service
diff --git a/debian/connman.install b/debian/connman.install
index df6ed5e0..e94f692f 100644
--- a/debian/connman.install
+++ b/debian/connman.install
@@ -1,8 +1,8 @@
src/main.conf etc/connman
usr/share/dbus-1/system.d/connman.conf
-lib/systemd/system/connman.service
-lib/systemd/system/connman-wait-online.service
+${env:deb_systemdsystemunitdir}/connman.service
+${env:deb_systemdsystemunitdir}/connman-wait-online.service
usr/share/man
usr/share/polkit-1/actions/net.connman.policy
diff --git a/debian/control b/debian/control
index 69181524..50fd5e5e 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,9 @@ Build-Depends: debhelper-compat (= 13),
wpasupplicant,
libbluetooth-dev,
libmnl-dev,
- ppp-dev
+ ppp-dev,
+ pkgconf,
+ systemd-dev,
Rules-Requires-Root: no
Standards-Version: 4.6.2
Vcs-Browser: https://salsa.debian.org/debian/connman
diff --git a/debian/rules b/debian/rules
index c727df8e..d525f4ff 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,7 @@
#!/usr/bin/make -f
# -*- makefile -*-
#export DH_VERBOSE=1
+export deb_systemdsystemunitdir = $(shell pkg-config --variable=systemdsystemunitdir systemd | sed s,^/,,)
export DEB_BUILD_MAINT_OPTIONS = hardening=+all
@@ -25,7 +26,7 @@ override_dh_auto_configure:
--enable-test \
--with-openconnect=/usr/sbin/openconnect \
--with-openvpn=/usr/sbin/openvpn \
- --with-systemdunitdir=/lib/systemd/system \
+ --with-systemdunitdir=/$(deb_systemdsystemunitdir) \
--with-tmpfilesdir=/usr/lib/tmpfiles.d
override_dh_install:
--
2.39.2
