From b22310041042a549e66832902665a7a57e6f52de Mon Sep 17 00:00:00 2001 From: ferreo Date: Wed, 20 Nov 2024 14:35:04 +0000 Subject: [PATCH] Clean up trailing whitespace in DKMS scripts and remove obsolete whitespace patch from the series file --- .github/release-nest-v3 | 2 +- .../1001-remove-trailing-whitespace.patch | 42 ------------------- debian/patches/series | 1 - 3 files changed, 1 insertion(+), 44 deletions(-) delete mode 100644 debian/patches/1001-remove-trailing-whitespace.patch diff --git a/.github/release-nest-v3 b/.github/release-nest-v3 index d8263ee..56a6051 100644 --- a/.github/release-nest-v3 +++ b/.github/release-nest-v3 @@ -1 +1 @@ -2 \ No newline at end of file +1 \ No newline at end of file diff --git a/debian/patches/1001-remove-trailing-whitespace.patch b/debian/patches/1001-remove-trailing-whitespace.patch deleted file mode 100644 index 66bef1f..0000000 --- a/debian/patches/1001-remove-trailing-whitespace.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 0ed79841a3898fde8bbab673563ee672974c468b Mon Sep 17 00:00:00 2001 -From: Andreas Beckmann -Date: Fri, 18 Oct 2024 01:45:04 +0200 -Subject: [PATCH] remove trailing whitespace - ---- - dkms.8.in | 4 ++-- - dkms.in | 16 ++++++++-------- - 2 files changed, 10 insertions(+), 10 deletions(-) - -diff --git a/dkms.8.in b/dkms.8.in -index 5c829d9..634c697 100644 ---- a/dkms.8.in -+++ b/dkms.8.in -@@ -333,8 +333,8 @@ combinations on the other kernel. - .TP - .B \-\-force - This option can be used in conjunction with --.B build, install --and -+.B build, install -+and - .B ldtarball - to force copying over existing files. - .TP -diff --git a/dkms.in b/dkms.in -index a8f2c6a..371290a 100644 ---- a/dkms.in -+++ b/dkms.in - -@@ -1941,7 +1941,7 @@ make_tarball() - die 6 "Failed to make tarball." - fi - -- eval "$make_tarball_rm_temp_dir_name" -+ eval "$make_tarball_rm_temp_dir_name" - unset make_tarball_rm_temp_dir_name - } - --- -2.39.5 - diff --git a/debian/patches/series b/debian/patches/series index 886c208..73b6f20 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ -1001-remove-trailing-whitespace.patch 1002-initially-clear-variables-that-can-contain-cleanup-c.patch 1003-add-help-h-options.patch 1004-common.postinst-source-etc-dkms-framework.conf.d-.co.patch