refresh patch

TODO check that the result looks sensible, forward upstream

diff --git a/debian/changelog b/debian/changelog
index c8c47ccaea4ad993e724bc6ec676ed9d8b794c15..142c5e83ae3ed690677193b9e253d67309249de9 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,13 @@
-smartmontools (6.6-1) UNRELEASED; urgency=medium
+smartmontools (6.6-2) UNRELEASED; urgency=medium
 
   * Update Vcs-* headers in control file: replace Alioth/anonscm URIs
     with salsa.debian.org.
   * new upstream version. Patches refreshed:
-    * 50_manpage_improvements.diff removed (integrated upstream)
+    * 61_cciss-doc.patch
+    Patches removed:
+    * 50_manpage_improvements.diff
 
- -- Jonathan Dowland <jmtd@debian.org>  Thu, 09 Aug 2018 16:46:03 +0100
+ -- Jonathan Dowland <jmtd@debian.org>  Thu, 09 Aug 2018 16:54:43 +0100
 
 smartmontools (6.5+svn4324-1) unstable; urgency=low
 

diff --git a/debian/patches/61_cciss-doc.patch b/debian/patches/61_cciss-doc.patch
index c0d70c4ee87ca07778cdca6be253fe6d20c0cd71..115bcf283aa6b58116d4949ef5f2e2342c871d14 100644 (file)
--- a/debian/patches/61_cciss-doc.patch
+++ b/debian/patches/61_cciss-doc.patch
@@ -6,9 +6,13 @@ file and adds some more cciss documentation to the manpages. I think this
 patch gets things to parity with the 3ware documentation with a couple
 minor exceptions
 
+Refreshed by jmtd@debian.org 2018-08-10
+
+diff --git a/smartd.conf b/smartd.conf
+index 5490bde..59addd4 100644
 --- a/smartd.conf
 +++ b/smartd.conf
-@@ -92,6 +92,12 @@
+@@ -92,6 +92,12 @@ DEVICESCAN -n standby -m root -M exec /usr/share/smartmontools/smartd-runner
  # NOTE: On Windows, DEVICESCAN works also for 3ware controllers.
  #/dev/hdc,0 -a -s L/../../2/01
  #/dev/hdc,1 -a -s L/../../2/03
@@ -21,28 +25,31 @@ minor exceptions
  
  # Monitor 3 ATA disks directly connected to a HighPoint RocketRAID. Start long
  # self-tests Sundays between 1-2, 2-3, and 3-4 am. 
+diff --git a/smartd.conf.5.in b/smartd.conf.5.in
+index 0afba1b..4c1f453 100644
 --- a/smartd.conf.5.in
 +++ b/smartd.conf.5.in
-@@ -157,6 +157,12 @@
- .B \ \ /dev/tws0 \-d 3ware,1 \-a \-s L/../../7/02
+@@ -162,6 +162,12 @@ Section below!
  .\" %ENDIF OS FreeBSD
- .B #
-+.B # Monitor 2 disks connected to the first HP SmartArray controller which
-+.B # uses the cciss driver. Start long tests on Sunday nights and short
-+.B # self-tests every night and send errors to root
-+.B \ \ /dev/cciss/c0d0 -d cciss,0 -a -s (L/../../7/02|S/../.././02) -m root
-+.B \ \ /dev/cciss/c0d0 -d cciss,1 -a -s (L/../../7/03|S/../.././03) -m root
-+.B #
- .B # Three SATA disks on a HighPoint RocketRAID controller.
- .B # Start short self-tests daily between 1\(en2, 2\(en3, and
- .B # 3\(en4 am.
-@@ -1492,6 +1498,9 @@
- If you want more frequent information, use:
- .B \-a.
- 
+ .\" %IF OS FreeBSD Linux
+ #
++# Monitor 2 disks connected to the first HP SmartArray controller which
++# uses the cciss driver. Start long tests on Sunday nights and short
++# self-tests every night and send errors to root
++# \ /dev/cciss/c0d0 -d cciss,0 -a -s (L/../../7/02|S/../.././02) -m root
++# \ /dev/cciss/c0d0 -d cciss,1 -a -s (L/../../7/03|S/../.././03) -m root
++#
+ # Three SATA disks on a HighPoint RocketRAID controller.
+ # Start short self\-tests daily between 1\-2, 2\-3, and
+ # 3\-4 am.
+@@ -1553,6 +1559,10 @@ configuration file Directives might be:
+ If you want more frequent information, use: \fB\-a\fP.
+ .Sp
+ .TP
 +.B If a cciss controller is used
 +then the corresponding block device (/dev/cciss/c?d?) must be listed,
 +along with the \'\-d cciss,N\' Directive (see below).
- .TP
++.TP
  .B ADDITIONAL DETAILS ABOUT DEVICESCAN
  If a non-comment entry in the configuration file is the text
+ string \fBDEVICESCAN\fP in capital letters, then \fBsmartd\fP will