patches/: Added 01_fix_hyphen_used_as_minus_sign.

This patch fixes the use of '-' in manpages.

diff --git a/debian/changelog b/debian/changelog
index 65de75de53056c02158e5771a1467401b1d892a5..9fd5ce1ef94410f154413ad6925aa27cb3af539f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -41,6 +41,8 @@ mlmmj (1.2.16-0.1) unstable; urgency=low
     - Removed unused 05_fix_call_to_free.
     - Added 01_fix_manpages to fix the what-is entry of the mlmmj-sub and
       mlmmj-unsub manpages.
+    - Added 01_fix_hyphen_used_as_minus_sign to fix the use of '-' in
+      manpages.
   * debian/bogus-conffiles:
     - Removed. This file is not used.
   * debian/docs:
@@ -48,7 +50,7 @@ mlmmj (1.2.16-0.1) unstable; urgency=low
   * debian/mlmmj-php-web-admin.apache.conf, debian/mlmmj-php-web.apache.conf:
     - Added example configurations for the Apache webserver.
 
- -- Sebastian Harl <sh@tokkee.org>  Thu, 05 Mar 2009 13:02:03 +0100
+ -- Sebastian Harl <sh@tokkee.org>  Thu, 05 Mar 2009 13:25:24 +0100
 
 mlmmj (1.2.15-1.1) unstable; urgency=low
 

diff --git a/debian/patches/00list b/debian/patches/00list
index f8ea1a2babc7f4c16c56b3e7b9e1117c5cabc46e..67f00d4b3b84092c815240a0e67702890d7869c0 100644 (file)
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1,3 +1,4 @@
 01_fix_manpages
+01_fix_hyphen_used_as_minus_sign
 05_fix_displayed_full_paths
 02_fix_mlmmj_php

diff --git a/debian/patches/01_fix_hyphen_used_as_minus_sign.dpatch b/debian/patches/01_fix_hyphen_used_as_minus_sign.dpatch
new file mode 100644 (file)
index 0000000..2b9aca5
--- /dev/null
+++ b/debian/patches/01_fix_hyphen_used_as_minus_sign.dpatch
@@ -0,0 +1,311 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_fix_hyphen_used_as_minus_sign.dpatch by Sebastian Harl <sh@tokkee.org>
+##
+## DP: Don't use '-' as a minus sign in manpages.
+
+@DPATCH@
+
+diff a/mlmmj-bounce.1 b/mlmmj-bounce.1
+--- a/man/mlmmj-bounce.1
++++ b/man/mlmmj-bounce.1
+@@ -1,9 +1,9 @@
+-.TH mlmmj-bounce "1" "September 2004" mlmmj-bounce
++.TH mlmmj\-bounce "1" "September 2004" mlmmj\-bounce
+ .SH NAME
+-mlmmj-bounce \- bounce handling utility for mlmmj
++mlmmj\-bounce \- bounce handling utility for mlmmj
+ .SH SYNOPSIS
+-.B mlmmj-bounce
+-\fI-L /path/to/list \fR[\fI-a john=doe.org | -d\fR]\fI \fR[\fI-n num | -p\fR]
++.B mlmmj\-bounce
++\fI\-L /path/to/list \fR[\fI\-a john=doe.org | \-d\fR]\fI \fR[\fI\-n num | \-p\fR]
+ .HP
+ \fB\-a\fR: Address string that bounces
+ .HP
+@@ -19,8 +19,8 @@
+ .HP
+ \fB\-V\fR: Print version
+ .SH DESCRIPTION
+-mlmmj-bounce is used to handle mails that are bouncing. When a mail arrives to
+-the system, mlmmj-bounce will register in <listdir>/bounce/<addrstring> info
++mlmmj\-bounce is used to handle mails that are bouncing. When a mail arrives to
++the system, mlmmj\-bounce will register in <listdir>/bounce/<addrstring> info
+ about which number that bounced at what time. An example of such a line could
+ be:
+ .LP
+diff a/mlmmj-list.1 b/mlmmj-list.1
+--- a/man/mlmmj-list.1
++++ b/man/mlmmj-list.1
+@@ -1,9 +1,10 @@
+-.TH mlmmj-list "1" "November 2004" mlmmj-recieve
++.TH mlmmj\-list "1" "November 2004" mlmmj\-recieve
+ .SH NAME
+-mlmmj-list \- list people / subscribers associated with a list
++mlmmj\-list \- list people / subscribers associated with a list
+ .SH SYNOPSIS
+-.B mlmmj-list
+-\fI-L /path/to/listdir \fR[\fI-c\fR] \fR[\fI-d\fR] \fR[\fI-h\fR] [\fI-m\fR] [\fI-n\fR] [\fI-o\fR] \fR[\fI-s\fR] \fR[\fI-V\fR]
++.B mlmmj\-list
++\fI\-L /path/to/listdir \fR[\fI\-c\fR] \fR[\fI\-d\fR] \fR[\fI\-h\fR]
++[\fI\-m\fR] [\fI\-n\fR] [\fI\-o\fR] \fR[\fI\-s\fR] \fR[\fI\-V\fR]
+ .HP
+ \fB\-c\fR: Count the emailaddresses
+ .HP
+diff a/mlmmj-maintd.1 b/mlmmj-maintd.1
+--- a/man/mlmmj-maintd.1
++++ b/man/mlmmj-maintd.1
+@@ -1,9 +1,9 @@
+-.TH mlmmj-maintd "1" "September 2004" mlmmj-maintd
++.TH mlmmj\-maintd "1" "September 2004" mlmmj\-maintd
+ .SH NAME
+-mlmmj-maintd \- maintenance for mlmmj maintained lists
++mlmmj\-maintd \- maintenance for mlmmj maintained lists
+ .SH SYNOPSIS
+-.B mlmmj-maintd
+-[\fI-F\fR] \fI[-d\fR | \fI-L\fR] /path/to/dir
++.B mlmmj\-maintd
++[\fI\-F\fR] \fI[\-d\fR | \fI\-L\fR] /path/to/dir
+ .HP
+ \fB\-d\fR: Full path to directory with lists
+ .HP
+@@ -18,7 +18,7 @@
+ etc.
+ 
+ If a directory containing several lists exists, the \fB\-d\fR can be used to
+-specify this, making mlmmj-maintd perform a maintenance run in every listdir
++specify this, making mlmmj\-maintd perform a maintenance run in every listdir
+ below the specified one.
+ 
+ Only either \fB\-d\fR or \fB\-L\fR can be specified at the same time.
+@@ -26,11 +26,11 @@
+ It will run as a daemon, unless the \fB\-F\fR switch is specified, in which
+ case it just runs once.  The \fB\-F\fR  option should be used when one wants to
+ avoid running another daemon, and use e.g. cron to control it instead. In case
+-cron is used, mlmmj-maintd should be run every 2 hours or so. An example
++cron is used, mlmmj\-maintd should be run every 2 hours or so. An example
+ crontab entry:
+ 
+ .LP
+-0 */2 * * * /usr/bin/mlmmj-maintd -F -L /path/to/list
++0 */2 * * * /usr/bin/mlmmj\-maintd \-F \-L /path/to/list
+ .SH AUTHORS
+ This manual page was written by the following persons:
+ .HP
+diff a/mlmmj-make-ml.sh.1 b/mlmmj-make-ml.sh.1
+--- a/man/mlmmj-make-ml.sh.1
++++ b/man/mlmmj-make-ml.sh.1
+@@ -1,8 +1,8 @@
+-.TH mlmmj-make-ml "1" "September 2004" mlmmj-make-ml
++.TH mlmmj\-make\-ml "1" "September 2004" mlmmj\-make\-ml
+ .SH NAME
+-mlmmj-make-ml \- create a mailing list for mlmmj
++mlmmj\-make\-ml \- create a mailing list for mlmmj
+ .SH SYNOPSIS
+-.B mlmmj-make-ml
++.B mlmmj\-make\-ml
+ \fI[OPTIONS]
+ .HP
+ \fB\-h\fR: Display help
+diff a/mlmmj-process.1 b/mlmmj-process.1
+--- a/man/mlmmj-process.1
++++ b/man/mlmmj-process.1
+@@ -1,9 +1,9 @@
+-.TH mlmmj-process "1" "September 2004" mlmmj-process
++.TH mlmmj\-process "1" "September 2004" mlmmj\-process
+ .SH NAME
+-mlmmj-process \- process mail for an mlmmj managed mailinglist
++mlmmj\-process \- process mail for an mlmmj managed mailinglist
+ .SH SYNOPSIS
+-.B mlmmj-process
+-\fI-L /path/to/list -m /path/to/mail \fR[\fI-h\fR] [\fI-P\fR] [\fI-V\fR]
++.B mlmmj\-process
++\fI\-L /path/to/list \-m /path/to/mail \fR[\fI\-h\fR] [\fI\-P\fR] [\fI\-V\fR]
+ .HP
+ \fB\-h\fR: This help
+ .HP
+@@ -11,7 +11,7 @@
+ .HP
+ \fB\-m\fR: Full path to mail file
+ .HP
+-\fB\-P\fR: Don't execute mlmmj-send (debugging only)
++\fB\-P\fR: Don't execute mlmmj\-send (debugging only)
+ .HP
+ \fB\-V\fR: Print version
+ .SH DESCRIPTION
+@@ -35,26 +35,26 @@
+ Header addition
+ 
+ Headers specified in <listdir>/control/customheaders are added to the mail.
+-This could be headers like List-ID: or Reply-To:
++This could be headers like List\-ID: or Reply\-To:
+ .IP \(bu 4
+ .B
+ List control
+ 
+ In case there's a mail with a recipient delimiter it's not a regular list mail.
+-Processing of these happens in mlmmj-recieve as well. Examples of such are
++Processing of these happens in mlmmj\-recieve as well. Examples of such are
+ subscription requests, mails to owner etc.
+-It will base it's recipient delimiter detection on the Delivered-To: header if
++It will base it's recipient delimiter detection on the Delivered\-To: header if
+ present. If not, the To: header is used.
+ .IP \(bu 4
+ .B
+ Moderation
+ 
+-If the list is moderated, it will happen in mlmmj-process.
++If the list is moderated, it will happen in mlmmj\-process.
+ .RE
+ 
+ When processing is done, it will invoke the needed binary according to whatever
+-mail it is. If it's a subscription request it will invoke mlmmj-sub, if it's a
+-regular list mail it will invoke mlmmj-send.
++mail it is. If it's a subscription request it will invoke mlmmj\-sub, if it's a
++regular list mail it will invoke mlmmj\-send.
+ .SH "SEE ALSO"
+ The file TUNABLES from the mlmmj source distribution or in the documentation
+ directory of the operating system distribution.
+diff a/mlmmj-recieve.1 b/mlmmj-recieve.1
+--- a/man/mlmmj-recieve.1
++++ b/man/mlmmj-recieve.1
+@@ -1,9 +1,9 @@
+-.TH mlmmj-recieve "1" "September 2004" mlmmj-recieve
++.TH mlmmj\-recieve "1" "September 2004" mlmmj\-recieve
+ .SH NAME
+-mlmmj-recieve \- recieve mails for an mlmmj managed mailinglist
++mlmmj\-recieve \- recieve mails for an mlmmj managed mailinglist
+ .SH SYNOPSIS
+-.B mlmmj-recieve
+-\fI-L /path/to/listdir \fR[\fI-h\fR] [\fI-V\fR] [\fI-P\fR] [\fI-F\fR]
++.B mlmmj\-recieve
++\fI\-L /path/to/listdir \fR[\fI\-h\fR] [\fI\-V\fR] [\fI\-P\fR] [\fI\-F\fR]
+ .HP
+ \fB\-h\fR: This help
+ .HP
+@@ -11,17 +11,17 @@
+ .HP
+ \fB\-L\fR: Full path to list directory
+ .HP
+-\fB\-P\fR: Don't execute mlmmj-process (debugging only)
++\fB\-P\fR: Don't execute mlmmj\-process (debugging only)
+ .HP
+ \fB\-V\fR: Print version
+ .SH DESCRIPTION
+-The mlmmj-recieve binary is the one specified in the mailserver configuration
++The mlmmj\-recieve binary is the one specified in the mailserver configuration
+ file (aliases file), which writes the mail to the <listdir>/incoming directory
+-and invokes mlmmj-process unless the \fB\-P\fR option is specified. On systems
++and invokes mlmmj\-process unless the \fB\-P\fR option is specified. On systems
+ using mailservers supporting the \fB/etc/aliases\fR file, a line to activate
+ an mlmmj managed mailinglist would look like this:
+ .LP
+-list: "|/usr/bin/mlmmj-recieve -L /var/spool/mlmmj/list/"
++list: "|/usr/bin/mlmmj\-recieve \-L /var/spool/mlmmj/list/"
+ 
+ It's very important to specify the full path to the binary, or the mailinglist
+ will not function.
+@@ -32,7 +32,7 @@
+ would kill it.
+ 
+ .SH "SEE ALSO"
+-mlmmj-process(1)
++mlmmj\-process(1)
+ .SH AUTHORS
+ This manual page was written by the following persons:
+ .HP
+diff a/mlmmj-send.1 b/mlmmj-send.1
+--- a/man/mlmmj-send.1
++++ b/man/mlmmj-send.1
+@@ -1,11 +1,11 @@
+-.TH mlmmj-send "1" "September 2004" mlmmj-send
++.TH mlmmj\-send "1" "September 2004" mlmmj\-send
+ .SH NAME
+-mlmmj-send \- send mail to a mailinglist or similar
++mlmmj\-send \- send mail to a mailinglist or similar
+ .SH SYNOPSIS
+-.B mlmmj-send
+-[\fI-L\fR /path/to/list | \fI-l\fR listctrl] \fI\-m\fR /path/to/mail
+-[\fI-a\fR] [\fI-D\fR] [\fI-F\fR] [\fI-h\fR] [\fI-r\fR] [\fI-R\fR] [\fI-s\fR]
+-[\fI-T\fR] [\fI-V\fR]
++.B mlmmj\-send
++[\fI\-L\fR /path/to/list | \fI\-l\fR listctrl] \fI\-m\fR /path/to/mail
++[\fI\-a\fR] [\fI\-D\fR] [\fI\-F\fR] [\fI\-h\fR] [\fI\-r\fR] [\fI\-R\fR] [\fI\-s\fR]
++[\fI\-T\fR] [\fI\-V\fR]
+ .HP
+ \fB\-a\fR: Don't archive the mail
+ .HP
+@@ -23,7 +23,7 @@
+ .HP
+ \fB\-r\fR: Relayhost IP address (defaults to 127.0.0.1)
+ .HP
+-\fB\-R\fR: What to use as Reply-To: header
++\fB\-R\fR: What to use as Reply\-To: header
+ .HP
+ \fB\-s\fR: Subscribers file name
+ .HP
+@@ -55,7 +55,7 @@
+ \&'6' means 'single listmail to single recipient'
+ 
+ .SH BUGS
+-This manual page is very scarce documentation of the mlmmj-send binary. The
++This manual page is very scarce documentation of the mlmmj\-send binary. The
+ reason for this is that it's really not supposed to be used by any human, but
+ only supposed to be invoked from other mlmmj binaries. So in case more
+ documentation is needed, please read the source.
+diff a/mlmmj-sub.1 b/mlmmj-sub.1
+--- a/man/mlmmj-sub.1
++++ b/man/mlmmj-sub.1
+@@ -1,10 +1,11 @@
+-.TH mlmmj-sub "1" "September 2004" mlmmj-sub
++.TH mlmmj\-sub "1" "September 2004" mlmmj\-sub
+ .SH NAME
+-mlmmj-sub \- subscribe an address to a mailinglist run by mlmmj
++mlmmj\-sub \- subscribe an address to a mailinglist run by mlmmj
+ .SH SYNOPSIS
+-.B mlmmj-sub
+-\fI-L /path/to/list -a john@doe.org \fR[\fI-c\fR | \fI-C\fR] \fR[\fI-d\fR | \fI-n\fR]
+-[\fI-h\fR] [\fI-U\fR] [\fI-V\fR]
++.B mlmmj\-sub
++\fI\-L /path/to/list \-a john@doe.org \fR[\fI\-c\fR | \fI\-C\fR] \fR[\fI\-d\fR
++| \fI\-n\fR]
++[\fI\-h\fR] [\fI\-U\fR] [\fI\-V\fR]
+ .HP
+ \fB\-a\fR: Email address to subscribe
+ .HP
+@@ -47,7 +48,7 @@
+ When neither \fB\-c\fR nor \fB\-C\fR are specified, subscription silently
+ happens.
+ .SH "SEE ALSO"
+-mlmmj-unsub(1), setuid(2)
++mlmmj\-unsub(1), setuid(2)
+ .SH AUTHORS
+ This manual page was written by the following persons:
+ .HP
+diff a/mlmmj-unsub.1 b/mlmmj-unsub.1
+--- a/man/mlmmj-unsub.1
++++ b/man/mlmmj-unsub.1
+@@ -1,10 +1,10 @@
+-.TH mlmmj-unsub "1" "September 2004" mlmmj-unsub
++.TH mlmmj\-unsub "1" "September 2004" mlmmj\-unsub
+ .SH NAME
+-mlmmj-unsub \- unsubscribe an address from a mailinglist run by mlmmj
++mlmmj\-unsub \- unsubscribe an address from a mailinglist run by mlmmj
+ .SH SYNOPSIS
+-.B mlmmj-sub
+-\fI-L /path/to/list -a john@doe.org \fR[\fI-c\fR | \fI-C\fR] [\fI-h\fR]
+-\fR[\fI-d\fR | \fI-n\fR] [\fI-V\fR]
++.B mlmmj\-sub
++\fI\-L /path/to/list \-a john@doe.org \fR[\fI\-c\fR | \fI\-C\fR] [\fI\-h\fR]
++\fR[\fI\-d\fR | \fI\-n\fR] [\fI\-V\fR]
+ .HP
+ \fB\-a\fR: Email address to unsubscribe
+ .HP
+@@ -41,7 +41,7 @@
+ When neither \fB\-c\fR nor \fB\-C\fR are specified, unsubscription silently
+ happens.
+ .SH "SEE ALSO"
+-mlmmj-sub(1)
++mlmmj\-sub(1)
+ .SH AUTHORS
+ This manual page was written by the following persons:
+ .HP