From a5ffbc3bcf7dc3afb09f5c4b51adda1bee37e747 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 3 Apr 2023 10:08:38 +0200 Subject: Renumbering patches. Signed-off-by: Daniel Baumann --- debian/patches/debian/0001-meson-nose2.patch | 15 +++++++++++++++ debian/patches/debian/0002-meson-nose2.patch | 15 --------------- debian/patches/series | 2 +- 3 files changed, 16 insertions(+), 16 deletions(-) create mode 100644 debian/patches/debian/0001-meson-nose2.patch delete mode 100644 debian/patches/debian/0002-meson-nose2.patch (limited to 'debian') diff --git a/debian/patches/debian/0001-meson-nose2.patch b/debian/patches/debian/0001-meson-nose2.patch new file mode 100644 index 0000000..4929c6a --- /dev/null +++ b/debian/patches/debian/0001-meson-nose2.patch @@ -0,0 +1,15 @@ +Author: Daniel Baumann +Description: Updating meson to find /usr/bin/nose2-3 (python3). + +diff -Naurp nvme-cli.orig/tests/meson.build nvme-cli/tests/meson.build +--- nvme-cli.orig/tests/meson.build ++++ nvme-cli/tests/meson.build +@@ -30,7 +30,7 @@ tests = [ + 'nvme_get_lba_status_test.py', + ] + +-runtests = find_program('nose2', required : false) ++runtests = find_program('nose2-3', required : false) + + if meson.version().version_compare('>= 0.56') + nvmecli_path = meson.project_build_root() diff --git a/debian/patches/debian/0002-meson-nose2.patch b/debian/patches/debian/0002-meson-nose2.patch deleted file mode 100644 index 4929c6a..0000000 --- a/debian/patches/debian/0002-meson-nose2.patch +++ /dev/null @@ -1,15 +0,0 @@ -Author: Daniel Baumann -Description: Updating meson to find /usr/bin/nose2-3 (python3). - -diff -Naurp nvme-cli.orig/tests/meson.build nvme-cli/tests/meson.build ---- nvme-cli.orig/tests/meson.build -+++ nvme-cli/tests/meson.build -@@ -30,7 +30,7 @@ tests = [ - 'nvme_get_lba_status_test.py', - ] - --runtests = find_program('nose2', required : false) -+runtests = find_program('nose2-3', required : false) - - if meson.version().version_compare('>= 0.56') - nvmecli_path = meson.project_build_root() diff --git a/debian/patches/series b/debian/patches/series index 1a7ad1a..2ecdfd2 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1 @@ -debian/0002-meson-nose2.patch +debian/0001-meson-nose2.patch -- cgit v1.2.3