Remove autogenerated roff as nfsdcltrack.man is meant to be used as the actual source...

diff --git a/debian/changelog b/debian/changelog
index b72e021b4b75b59d1bb6469492490223a7c39d3d..344560c1a8caaa4d2085810e42ad0c86d7da7525 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
-nfs-utils (1:1.2.8-2) UNRELEASED; urgency=low
+nfs-utils (1:1.2.8-2) UNRELEASED; urgency=medium
 
   * Fix reportbug scripts to use rpcinfo in /usr/sbin.
   * Add id_resolver.conf to fix nfsidmap invocation
     (Closes: #708156, #638157, #707960).
+  * Remove autogenerated roff as nfsdcltrack.man is meant to be used
+    as the actual source according to author (Closes: #707908).
 
  -- Luk Claes <luk@zomers.be>  Sun, 12 May 2013 15:38:54 +0200
 

diff --git a/debian/patches/20-remove-autogenerated-man.patch b/debian/patches/20-remove-autogenerated-man.patch
new file mode 100644 (file)
index 0000000..76b9dea
--- /dev/null
+++ b/debian/patches/20-remove-autogenerated-man.patch
@@ -0,0 +1,140 @@
+The man page was generated, but this file is intended as the source to make modifications. So remove all generated comments and only leave what's needed and easily maintained manually without changing the appearance of the man page.
+
+Acked-by: Jeff Layton <jlayton@xxxxxxxxxx>
+Signed-off-by: Luk Claes <luk@xxxxxxxxxx>
+---
+ utils/nfsdcltrack/nfsdcltrack.man |  114 -------------------------------------
+ 1 file changed, 114 deletions(-)
+
+diff --git a/utils/nfsdcltrack/nfsdcltrack.man b/utils/nfsdcltrack/nfsdcltrack.man
+index 47007df..6940788 100644
+--- a/utils/nfsdcltrack/nfsdcltrack.man
++++ b/utils/nfsdcltrack/nfsdcltrack.man
+@@ -1,53 +1,3 @@
+-.\" Automatically generated by Pod::Man 2.25 (Pod::Simple 3.16)
+-.\"
+-.\" Standard preamble:
+-.\" ========================================================================
+-.de Sp \" Vertical space (when we can't use .PP)
+-.if t .sp .5v
+-.if n .sp
+-..
+-.de Vb \" Begin verbatim text
+-.ft CW
+-.nf
+-.ne \\$1
+-..
+-.de Ve \" End verbatim text
+-.ft R
+-.fi
+-..
+-.\" Set up some character translations and predefined strings.  \*(-- will
+-.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
+-.\" double quote, and \*(R" will give a right double quote.  \*(C+ will
+-.\" give a nicer C++.  Capital omega is used to do unbreakable dashes and
+-.\" therefore won't be available.  \*(C` and \*(C' expand to `' in nroff,
+-.\" nothing in troff, for use with C<>.
+-.tr \(*W-
+-.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
+-.ie n \{\
+-.    ds -- \(*W-
+-.    ds PI pi
+-.    if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch
+-.    if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\"  diablo 12 pitch
+-.    ds L" ""
+-.    ds R" ""
+-.    ds C` ""
+-.    ds C' ""
+-'br\}
+-.el\{\
+-.    ds -- \|\(em\|
+-.    ds PI \(*p
+-.    ds L" ``
+-.    ds R" ''
+-'br\}
+-.\"
+-.\" Escape single quotes in literal strings from groff's Unicode transform.
+-.ie \n(.g .ds Aq \(aq
+-.el       .ds Aq '
+-.\"
+-.\" If the F register is turned on, we'll generate index entries on stderr for
+-.\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index
+-.\" entries marked with X<> in POD.  Of course, you'll have to process the
+-.\" output yourself in some meaningful fashion.
+ .ie \nF \{\
+ .    de IX
+ .    tm Index:\\$1\t\\n%\t"\\$2"
+@@ -59,70 +9,6 @@
+ .    de IX
+ ..
+ .\}
+-.\"
+-.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
+-.\" Fear.  Run.  Save yourself.  No user-serviceable parts.
+-.    \" fudge factors for nroff and troff
+-.if n \{\
+-.    ds #H 0
+-.    ds #V .8m
+-.    ds #F .3m
+-.    ds #[ \f1
+-.    ds #] \fP
+-.\}
+-.if t \{\
+-.    ds #H ((1u-(\\\\n(.fu%2u))*.13m)
+-.    ds #V .6m
+-.    ds #F 0
+-.    ds #[ \&
+-.    ds #] \&
+-.\}
+-.    \" simple accents for nroff and troff
+-.if n \{\
+-.    ds ' \&
+-.    ds ` \&
+-.    ds ^ \&
+-.    ds , \&
+-.    ds ~ ~
+-.    ds /
+-.\}
+-.if t \{\
+-.    ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u"
+-.    ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u'
+-.    ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u'
+-.    ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u'
+-.    ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u'
+-.    ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u'
+-.\}
+-.    \" troff and (daisy-wheel) nroff accents
+-.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V'
+-.ds 8 \h'\*(#H'\(*b\h'-\*(#H'
+-.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#]
+-.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H'
+-.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u'
+-.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#]
+-.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#]
+-.ds ae a\h'-(\w'a'u*4/10)'e
+-.ds Ae A\h'-(\w'A'u*4/10)'E
+-.    \" corrections for vroff
+-.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u'
+-.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u'
+-.    \" for low resolution devices (crt and lpr)
+-.if \n(.H>23 .if \n(.V>19 \
+-\{\
+-.    ds : e
+-.    ds 8 ss
+-.    ds o a
+-.    ds d- d\h'-1'\(ga
+-.    ds D- D\h'-1'\(hy
+-.    ds th \o'bp'
+-.    ds Th \o'LP'
+-.    ds ae ae
+-.    ds Ae AE
+-.\}
+-.rm #[ #] #H #V #F C
+-.\" ========================================================================
+-.\"
+ .IX Title "NFSDCLTRACK 8"
+ .TH NFSDCLTRACK 8 "2012-10-24" "" ""
+ .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
+-- 
+1.7.10.4
+

diff --git a/debian/patches/series b/debian/patches/series
index 09fed6f7fd69181a965154c73a00eb8d4964fedc..47820875de8dfd3040faa3829abb25f170bd885c 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@
 16-mount.nfs.man-update-distinction-between-fstype.patch
 17-multiarch-kerberos-paths.patch
 19-iscsiadm-path.patch
+20-remove-autogenerated-man.patch