Source: kdump-tools
Version: 1:1.8.1
Severity: normal
Tags: patch
User: helm...@debian.org
Usertags: dep17m2
Dear Maintainer,
your package installs files related to systemd and udev, into /lib.
These files need to be moved to /usr/lib as part of Debian's
usr-merge effort [1].
Attached you'll find two patches to use the debhelper tools
dh_installsystemd and dh_installudev to install these files.
For unstable, the systemd files will immediately go to /usr/lib. The
udev files will move there once we update dh_installudev, and your
package will benefit after a binNMU.
The same patches can be found in this salsa MR:
https://salsa.debian.org/debian/kdump-tools/-/merge_requests/21
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
>From bdaaf4e4ca2db654f5b324b73124dfa284383ee6 Mon Sep 17 00:00:00 2001
From: Chris Hofstaedtler <z...@debian.org>
Date: Fri, 8 Dec 2023 17:01:39 +0100
Subject: [PATCH 1/2] Let dh_installudev choose location of udev rules
---
debian/kdump-tools.install | 1 -
debian/{50-kdump-tools.rules => kdump-tools.udev} | 0
debian/rules | 3 +++
3 files changed, 3 insertions(+), 1 deletion(-)
rename debian/{50-kdump-tools.rules => kdump-tools.udev} (100%)
diff --git a/debian/kdump-tools.install b/debian/kdump-tools.install
index 39fb6ec..28dbc60 100644
--- a/debian/kdump-tools.install
+++ b/debian/kdump-tools.install
@@ -1,4 +1,3 @@
-debian/50-kdump-tools.rules /lib/udev/rules.d/
debian/kdump-config /usr/sbin
debian/kdump-tools-dump.service /lib/systemd/system/
debian/kdump-tools.conf /usr/share/kdump-tools/
diff --git a/debian/50-kdump-tools.rules b/debian/kdump-tools.udev
similarity index 100%
rename from debian/50-kdump-tools.rules
rename to debian/kdump-tools.udev
diff --git a/debian/rules b/debian/rules
index 9bddbef..aa47d89 100755
--- a/debian/rules
+++ b/debian/rules
@@ -54,6 +54,9 @@ override_dh_installdeb:
debian/kdump-tools.maintscript
dh_installdeb
+override_dh_installudev:
+ dh_installudev -pkdump-tools --priority=50
+
override_dh_auto_clean:
rm -f debian/kdump-tools.maintscript
rm -f debian/kdump-config debian/kdump-tools.conf debian/kdump-tools.5
--
2.39.2
>From 151408bbfef079e938e90e8bd712248078360c07 Mon Sep 17 00:00:00 2001
From: Chris Hofstaedtler <z...@debian.org>
Date: Fri, 8 Dec 2023 17:04:22 +0100
Subject: [PATCH 2/2] Let dh_installsystemd choose location of systemd services
---
debian/kdump-tools.install | 1 -
...ools-dump.service => kdump-tools.kdump-tools-dump.service} | 0
debian/rules | 4 ++++
3 files changed, 4 insertions(+), 1 deletion(-)
rename debian/{kdump-tools-dump.service => kdump-tools.kdump-tools-dump.service} (100%)
diff --git a/debian/kdump-tools.install b/debian/kdump-tools.install
index 28dbc60..d3c1c6d 100644
--- a/debian/kdump-tools.install
+++ b/debian/kdump-tools.install
@@ -1,4 +1,3 @@
debian/kdump-config /usr/sbin
-debian/kdump-tools-dump.service /lib/systemd/system/
debian/kdump-tools.conf /usr/share/kdump-tools/
debian/sysctl.conf /etc/kdump/
diff --git a/debian/kdump-tools-dump.service b/debian/kdump-tools.kdump-tools-dump.service
similarity index 100%
rename from debian/kdump-tools-dump.service
rename to debian/kdump-tools.kdump-tools-dump.service
diff --git a/debian/rules b/debian/rules
index aa47d89..a358a06 100755
--- a/debian/rules
+++ b/debian/rules
@@ -57,6 +57,10 @@ override_dh_installdeb:
override_dh_installudev:
dh_installudev -pkdump-tools --priority=50
+override_dh_installsystemd:
+ dh_installsystemd -pkdump-tools kdump-tools.service
+ dh_installsystemd -pkdump-tools --name=kdump-tools-dump --no-enable kdump-tools-dump.service
+
override_dh_auto_clean:
rm -f debian/kdump-tools.maintscript
rm -f debian/kdump-config debian/kdump-tools.conf debian/kdump-tools.5
--
2.39.2
