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 <noreply@anthropic.com>
Signed-off-by: Martin Renvoize <martin.renvoize@openfifth.co.uk>
Signed-off-by: Pedro Amorim <pedro.amorim@openfifth.co.uk>
This commit is contained in:
parent
2992ea058b
commit
529df17b42
|
|
@ -3,7 +3,6 @@ Maintainer: Mason James <mtj@kohaaloha.com>
|
|||
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,
|
||||
|
|
|
|||
|
|
@ -3,7 +3,6 @@ Maintainer: Mason James <mtj@kohaaloha.com>
|
|||
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,
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
usr/lib/systemd/system
|
||||
lib/systemd/system
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue