From 529df17b4291ea99a91aae34b4e8ff0cc98311ae Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Tue, 15 Sep 2026 17:30:32 +0100 Subject: [PATCH] Bug 40901: (QA follow-up) Install units to /lib/systemd/system and tidy control The old koha-common package shipped /lib/systemd/system/koha-common.service while koha-systemd installs to /usr/lib/systemd/system. On a merged-/usr Debian 12 host these are the same file through the /lib symlink, but dpkg compares path strings, so Replaces does not apply and removing the old package's copy can delete the file koha-systemd just unpacked (the DEP-17 aliasing problem). Keep the units under lib/systemd/system, the path the previous package used, so this is an ordinary takeover. While here: - koha-core gains Recommends: koha-systemd | koha-sysv. Installing it alone previously gave helpers that fell back to the daemon(1) wrapper that no longer gets installed. - drop a stray comment from the Source stanza of control.in - stop appending Perl dependencies to koha-common.substvars: the metapackage no longer uses ${koha:Depends} Co-Authored-By: Claude Fable 5.1 Signed-off-by: Martin Renvoize Signed-off-by: Pedro Amorim --- debian/control | 2 +- debian/control.in | 2 +- debian/koha-systemd.dirs | 2 +- debian/koha-systemd.install | 4 ++-- debian/rules | 1 - 5 files changed, 5 insertions(+), 6 deletions(-) diff --git a/debian/control b/debian/control index 7aa59b218e..84005b5c6d 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,6 @@ Maintainer: Mason James Section: web Priority: optional Standards-Version: 3.8.4 -# koha-systemd package provides systemd units only # WARNING: The "control" file is automatically generated from the "control.in" file. # Do not manually edit "control" or your changes will be clobbered when you # run update-control @@ -441,6 +440,7 @@ Description: integrated (physical) library management system . Most users should install koha-common instead, which will automatically select the appropriate init system. +Recommends: koha-systemd | koha-sysv Depends: ${misc:Depends}, ${koha:Depends}, at, cron-daemon, diff --git a/debian/control.in b/debian/control.in index 93243d8472..0df638903a 100644 --- a/debian/control.in +++ b/debian/control.in @@ -3,7 +3,6 @@ Maintainer: Mason James Section: web Priority: optional Standards-Version: 3.8.4 -# koha-systemd package provides systemd units only # WARNING: The "control" file is automatically generated from the "control.in" file. # Do not manually edit "control" or your changes will be clobbered when you # run update-control @@ -105,6 +104,7 @@ Description: integrated (physical) library management system . Most users should install koha-common instead, which will automatically select the appropriate init system. +Recommends: koha-systemd | koha-sysv Depends: ${misc:Depends}, ${koha:Depends}, at, cron-daemon, diff --git a/debian/koha-systemd.dirs b/debian/koha-systemd.dirs index 8efa80f4d9..67f1eed43e 100644 --- a/debian/koha-systemd.dirs +++ b/debian/koha-systemd.dirs @@ -1 +1 @@ -usr/lib/systemd/system +lib/systemd/system diff --git a/debian/koha-systemd.install b/debian/koha-systemd.install index 2ca74958b5..1750487f60 100644 --- a/debian/koha-systemd.install +++ b/debian/koha-systemd.install @@ -1,4 +1,4 @@ -debian/systemd/*.service usr/lib/systemd/system -debian/systemd/*.target usr/lib/systemd/system +debian/systemd/*.service lib/systemd/system +debian/systemd/*.target lib/systemd/system debian/systemd/koha-systemd-ctl usr/sbin debian/scripts/koha-generate-env usr/sbin diff --git a/debian/rules b/debian/rules index 05c9eb23db..b0635e2937 100755 --- a/debian/rules +++ b/debian/rules @@ -27,7 +27,6 @@ override_dh_installlogrotate: dh_installlogrotate --remaining-packages override_dh_gencontrol: - debian/bd-to-depends >> debian/koha-common.substvars debian/bd-to-depends >> debian/koha-core.substvars dh_gencontrol