Browse Source

Refresh patch queue

Remove (were cherry-picked, no longer applicable)
* cherry-pick.v8-1-g83cd0c3.fix-invalid-man-page-section-reference
* cherry-pick.v8-2-g278d01d.fix-typos-in-the-man-page

Rename local patches for confirmity.
Christoph Biedl 11 months ago
parent
commit
72b824db14

+ 0 - 18
debian/patches/cherry-pick.v8-1-g83cd0c3.fix-invalid-man-page-section-reference.patch

@@ -1,18 +0,0 @@
-Subject: Fix invalid man page section reference
-Origin: v8-1-g83cd0c3
-Upstream-Author: Nathaniel McCallum <npmccallum@redhat.com>
-Date: Tue Oct 31 12:49:12 2017 -0400
-
-    Fixes: #1
-
---- a/luksmeta.8
-+++ b/luksmeta.8
-@@ -1,7 +1,7 @@
- .\" generated with Ronn/v0.7.3
- .\" http://github.com/rtomayko/ronn/tree/0.7.3
- .
--.TH "LUKSMETA" "1" "June 2017" "" ""
-+.TH "LUKSMETA" "8" "October 2017" "" ""
- .
- .SH "NAME"
- \fBluksmeta\fR \- Utility for storing metadata in a LUKSv1 header

+ 0 - 27
debian/patches/cherry-pick.v8-2-g278d01d.fix-typos-in-the-man-page.patch

@@ -1,27 +0,0 @@
-Subject: Fix typos in the man page
-Origin: v8-2-g278d01d
-Upstream-Author: Nathaniel McCallum <npmccallum@redhat.com>
-Date: Tue Oct 31 12:52:47 2017 -0400
-
-    Fixes: #2
-
---- a/luksmeta.8
-+++ b/luksmeta.8
-@@ -130,7 +130,7 @@
- \fBEX_NOPERM\fR : The user did not grant permission during confirmation\.
- .
- .IP "\(bu" 4
--\fBEX_NOINPUT\fR : An error occured while reading from standard input\.
-+\fBEX_NOINPUT\fR : An error occurred while reading from standard input\.
- .
- .IP "\(bu" 4
- \fBEX_DATAERR\fR : The specified UUID does not match the slot UUID\.
-@@ -144,7 +144,7 @@
- Additionally, \fBluksmeta save\fR will return \fBEX_UNAVAILABLE\fR when you attempt to save data into a slot that is already used\. Likewise, \fBluksmeta load\fR will return \fBEX_UNAVAILABLE\fR when you attempt to read from an empty slot\.
- .
- .SH "EXAMPLES"
--Destroy all data (including LUKSMeta data) in the LUKSv1 header gap and initalize the gap for LUKSMeta storage:
-+Destroy all data (including LUKSMeta data) in the LUKSv1 header gap and initialize the gap for LUKSMeta storage:
- .
- .IP "" 4
- .

debian/patches/dont-fail-tests-for-disabled-module-load.patch → debian/patches/local.dont-fail-tests-for-disabled-module-load.patch


debian/patches/test-luksmeta.patch → debian/patches/local.test-luksmeta.patch


+ 2 - 4
debian/patches/series

@@ -1,6 +1,4 @@
 # cherry-picked from upstream
-cherry-pick.v8-1-g83cd0c3.fix-invalid-man-page-section-reference.patch
-cherry-pick.v8-2-g278d01d.fix-typos-in-the-man-page.patch
 
-test-luksmeta.patch
-dont-fail-tests-for-disabled-module-load.patch
+local.test-luksmeta.patch
+local.dont-fail-tests-for-disabled-module-load.patch