Refreshing fix-manpages.patch.

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

2 files changed, 20 insertions, 49 deletions

diff --git a/debian/patches/fix-manpages.patch b/debian/patches/debian/0001-fix-manpages.patch
index abe2cc0..d9e7941 100644
--- a/debian/patches/fix-manpages.patch
+++ b/debian/patches/debian/0001-fix-manpages.patch
@@ -1,14 +1,10 @@
-Description: Fix typos and macro issues in manpages
 Author: Felix Lechner <felix.lechner@lease-up.com>
-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=915182
-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=916946
-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=962946
-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=933773
-Forwarded: no
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/md.4
-+++ b/md.4
+Description: Fix typos and macro issues in manpages
+ (Closes: #915182, #916946, #962946, #933773).
+
+diff -Naurp mdadm.orig/md.4 mdadm/md.4
+--- mdadm.orig/md.4
++++ mdadm/md.4
 @@ -363,9 +363,9 @@ tab(;);
  ;Device #1;Device #2;Device #3;Device #4
  0x00;0;0;1;1
@@ -106,11 +102,12 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  .IR mdadm .
  
  If a FAILFAST request does fail, and if it is still safe to mark the
---- a/mdadm.8.in
-+++ b/mdadm.8.in
-@@ -461,11 +461,10 @@ number of spare devices.
- .BR \-z ", " \-\-size=
- Amount (in Kilobytes) of space to use from each drive in RAID levels 1/4/5/6.
+diff -Naurp mdadm.orig/mdadm.8.in mdadm/mdadm.8.in
+--- mdadm.orig/mdadm.8.in
++++ mdadm/mdadm.8
+@@ -459,11 +459,10 @@ number of spare devices.
+ Amount (in Kilobytes) of space to use from each drive in RAID levels 1/4/5/6/10
+ and for RAID 0 on external metadata.
  This must be a multiple of the chunk size, and must leave about 128Kb
 -of space at the end of the drive for the RAID superblock.
 -If this is not specified
@@ -124,16 +121,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  
  A suffix of 'K', 'M', 'G' or 'T' can be given to indicate Kilobytes,
  Megabytes, Gigabytes or Terabytes respectively.
-@@ -682,7 +681,7 @@ A bug introduced in Linux 3.14 means tha
- started using a different layout.  This could lead to
- data corruption.  Since Linux 5.4 (and various stable releases that received
- backports), the kernel will not accept such an array unless
--a layout is explictly set.  It can be set to
-+a layout is explicitly set.  It can be set to
- .RB ' original '
- or
- .RB ' alternate '.
-@@ -924,6 +923,7 @@ the
+@@ -927,6 +926,7 @@ the
  .B name
  will default to
  .IR home .
@@ -141,7 +129,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  
  .TP
  .BR \-R ", " \-\-run
-@@ -1133,7 +1133,7 @@ out-of-date.  If
+@@ -1131,7 +1131,7 @@ out-of-date.  If
  cannot find enough working devices to start the array, but can find
  some devices that are recorded as having failed, then it will mark
  those devices as working so that the array can be started. This works only for
@@ -150,16 +138,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  An array which requires
  .B \-\-force
  to be started may contain data corruption.  Use it carefully.
-@@ -1446,7 +1446,7 @@ array, and the slot that it used is stil
- be added back to the array in the same position.  This will normally
- cause the data for that device to be recovered.  However based on the
- event count on the device, the recovery may only require sections that
--are flagged a write-intent bitmap to be recovered or may not require
-+are flagged by a write-intent bitmap to be recovered or may not require
- any recovery at all.
- 
- When used on an array that has no metadata (i.e. it was built with
-@@ -1821,7 +1821,7 @@ Details of
+@@ -1814,7 +1814,7 @@ Details of
  .B check
  and
  .B repair
@@ -168,16 +147,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  .IR md (4)
  under
  .BR "SCRUBBING AND MISMATCHES" .
-@@ -2901,7 +2901,7 @@ long time.  A
- is required.  If the array is not simultaneously being grown or
- shrunk, so that the array size will remain the same - for example,
- reshaping a 3-drive RAID5 into a 4-drive RAID6 - the backup file will
--be used not just for a "cricital section" but throughout the reshape
-+be used not just for a "critical section" but throughout the reshape
- operation, as described below under LAYOUT CHANGES.
- 
- .SS CHUNK-SIZE AND LAYOUT CHANGES
-@@ -2939,7 +2939,8 @@ option in Grow mode. Currently this work
+@@ -2957,7 +2957,8 @@ option in Grow mode. Currently this work
  .B ppl
  and
  .B resync
@@ -187,8 +157,9 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  
  .SH INCREMENTAL MODE
  
---- a/mdmon.8
-+++ b/mdmon.8
+diff -Naurp mdadm.orig/mdmon.8 mdadm/mdmon.8
+--- mdadm.orig/mdmon.8
++++ mdadm/mdmon.8
 @@ -115,7 +115,7 @@ container.  Some array management comman
  add are now only valid at the container level.  Attempts to perform
  these actions on member arrays are blocked with error messages like:
diff --git a/debian/patches/series b/debian/patches/series
index 13329aa..634f37d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,4 @@
-fix-manpages.patch
+debian/0001-fix-manpages.patch
 mdmonitor-service-simplify.diff
 host-name-in-default-mailfrom.patch
 exit-gracefully-when-md-device-not-found.patch