Source: nvme-cli
Version: 2.6-1
Severity: normal
Tags: patch
User: helm...@debian.org
Usertags: dep17m2
Hi!
Your package previously moved systemd units into /lib, because of
missing debhelper support. For the ongoing Debian UsrMerge effort
[1] they need to move back into /usr/lib.
I'm attaching a patch to implement this, probably just reverting
what was done previously.
However, please still read the wiki page on moving files, especially
if you intend to backport to bookworm or earlier.
If during the trixie cycle your package will undergo structural
changes or any other file moves, please also see the wiki and upload
to experimental first when these changes are done.
Chris
[1] https://wiki.debian.org/UsrMerge
diff -Nru nvme-cli-2.6/debian/changelog nvme-cli-2.6/debian/changelog
--- nvme-cli-2.6/debian/changelog 2023-10-04 14:53:26.000000000 +0200
+++ nvme-cli-2.6/debian/changelog 2023-12-25 11:16:45.000000000 +0100
@@ -1,3 +1,10 @@
+nvme-cli (2.6-1.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Install systemd units again into /usr/lib/systemd/system. (Closes: #-1)
+
+ -- Chris Hofstaedtler <z...@debian.org> Mon, 25 Dec 2023 11:16:45 +0100
+
nvme-cli (2.6-1) sid; urgency=medium
* Uploading to sid.
diff -Nru nvme-cli-2.6/debian/control nvme-cli-2.6/debian/control
--- nvme-cli-2.6/debian/control 2023-10-04 14:53:11.000000000 +0200
+++ nvme-cli-2.6/debian/control 2023-12-25 11:16:45.000000000 +0100
@@ -5,6 +5,7 @@
Build-Depends:
asciidoc,
cmake,
+ debhelper (>= 13.11.6),
debhelper-compat (= 13),
flake8 <!nocheck>,
isort <!nocheck>,
diff -Nru nvme-cli-2.6/debian/patches/debian/0002-meson-systemd.patch nvme-cli-2.6/debian/patches/debian/0002-meson-systemd.patch
--- nvme-cli-2.6/debian/patches/debian/0002-meson-systemd.patch 2023-10-04 14:52:52.000000000 +0200
+++ nvme-cli-2.6/debian/patches/debian/0002-meson-systemd.patch 1970-01-01 01:00:00.000000000 +0100
@@ -1,15 +0,0 @@
-Author: Daniel Baumann <daniel.baum...@progress-linux.org>
-Description: Overwriting systemd unit directory until debhelper supports /usr/lib/systemd/system (Closes: #1034232).
-
-diff -Naurp nvme-cli.orig/meson.build nvme-cli/meson.build
---- nvme-cli.orig/meson.build
-+++ nvme-cli/meson.build
-@@ -26,7 +26,7 @@ sysconfdir = join_paths(prefixdir, get_option('sysconfdir'))
-
- udevrulesdir = join_paths(prefixdir, get_option('udevrulesdir'))
- dracutrulesdir = join_paths(prefixdir, get_option('dracutrulesdir'))
--systemddir = join_paths(prefixdir, get_option('systemddir'))
-+systemddir = '/lib/systemd/system'
- rundir = join_paths(prefixdir, get_option('rundir'))
-
- ###############################################################################
diff -Nru nvme-cli-2.6/debian/patches/series nvme-cli-2.6/debian/patches/series
--- nvme-cli-2.6/debian/patches/series 2023-10-04 14:52:52.000000000 +0200
+++ nvme-cli-2.6/debian/patches/series 2023-12-25 11:16:45.000000000 +0100
@@ -1,2 +1 @@
debian/0001-meson-nose2.patch
-debian/0002-meson-systemd.patch
