Merging debian version 2.8-2.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

3 files changed, 7 insertions, 16 deletions

diff --git a/debian/changelog b/debian/changelog
index bbcea5f..edda3ed 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+nvme-cli (2.8-2) sid; urgency=medium
+
+  * Uploading to sid.
+  * Moving systemd units to /usr (Closes: #1059430).
+
+ -- Daniel Baumann <daniel.baumann@progress-linux.org>  Wed, 06 Mar 2024 07:08:19 +0100
+
 nvme-cli (2.8-1~progress7.99u1) graograman-backports; urgency=medium
 
   * Initial reupload to graograman-backports.
diff --git a/debian/patches/debian/0002-meson-systemd.patch b/debian/patches/debian/0002-meson-systemd.patch
deleted file mode 100644
index 732544b..0000000
--- a/debian/patches/debian/0002-meson-systemd.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Author: Daniel Baumann <daniel.baumann@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 --git a/debian/patches/series b/debian/patches/series
index 4758381..2ecdfd2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 debian/0001-meson-nose2.patch
-debian/0002-meson-systemd.patch