[Reportbug-commits] [SCM] Reportbug - reports bugs in the Debian distribution branch, master, updated. 6.0-43-g2b254c9

[Sandro Tosi]

The following commit has been merged in the master branch:
commit 2b254c96be0bc89766f135f4e69e7be2ff2192df
Author: Sandro Tosi <morph at debian.org>
Date:   Sun Aug 28 15:35:50 2011 +0200

    complete manpage and example config file with all the accepted options

diff --git a/conf/reportbug.conf b/conf/reportbug.conf
index 905b1a7..fd08bab 100644
--- a/conf/reportbug.conf
+++ b/conf/reportbug.conf
@@ -6,13 +6,13 @@
 # severity normal
 
 # BTS to use
-#bts debian
 # See 'reportbug --bts help' for a current list of supported BTSes
+# bts debian
 
 # Submission address: default is 'submit'
-submit
 # Can also be 'quiet' or 'maintonly'; see --report-quiet and --maintonly
 # entries on man page
+submit
 
 # Mailer to use (default is empty, to use internal mailer). One of:
 # mutt
@@ -46,11 +46,12 @@ compress
 # Specify one of the following to digitally sign bug reports automatically.
 # sign gpg
 # sign pgp
+# sign gnupg
+# sign none #to disable signing
 
 # Specify the GPG/PGP keyid to use instead of the default one on your system.
 # keyid 56187544
 
-
 # Default "from" email address and real name (override with env. vars.)
 # email "humberto at example.com"
 # realname "Humberto Flores III"
@@ -88,6 +89,9 @@ compress
 # Always use template mode (bypass all prompts, output to stdout)
 # template
 
+# Print the report on screen, don't sent it
+# printonly
+
 # Don't query source packages
 # no-query-source
 
@@ -109,3 +113,15 @@ verify
 
 # Use a command to open the mbox file of the reports
 # mbox_reader_cmd "mutt -f %s"
+
+# Justification in case of RC bugs
+# justification "text here"
+
+# BTS mirror
+# mirror http://mirror.address/
+
+# Paranoid mode, print the whole email envelope before sending it
+# paranoid
+
+# The max dimension allowed for an attachment file
+# max_attachment_size
diff --git a/debian/changelog b/debian/changelog
index 16f1fcd..64fe263 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -52,8 +52,10 @@ reportbug (6.2) UNRELEASED; urgency=low
     - use a POSIX lexer to parse configuration files so that escaping double
       quotes for 'realname' can be parsed correctly; thanks to Paul "TBBle"
       Hampson for the report; Closes: #579891
+  * conf/reportbug.conf, man/reportbug.conf.5
+    - complete manpage and example config file with all the accepted options
 
- -- Sandro Tosi <morph at debian.org>  Sun, 28 Aug 2011 12:11:38 +0200
+ -- Sandro Tosi <morph at debian.org>  Sun, 28 Aug 2011 15:35:16 +0200
 
 reportbug (6.1) unstable; urgency=low
 
diff --git a/man/reportbug.conf.5 b/man/reportbug.conf.5
index 66546e1..ad5b582 100644
--- a/man/reportbug.conf.5
+++ b/man/reportbug.conf.5
@@ -117,6 +117,12 @@ variables, see \fBreportbug(1)\fP). Example:
 \fBhttp_proxy\fP \fIhttp://proxy.example.com:3128/\fP
 
 .TP
+.B justification
+The justification in case of a Release Critical bug (severity either 'critical', 'serious' or 'grave'). Example:
+
+\fBjustification\fP \fI"text here"\fP
+
+.TP
 .B keyid
 The GPG key to use, if different from the default one on the system.
 Example:
@@ -136,6 +142,12 @@ The max size any attachment can have. Example:
 .B mh
 Use the \fBmh\fP mailer.
 .TP
+.B mirror
+The address of a BTS mirror. Example:
+
+\fBmirror\fP \fIhttp://mirror.address/\fP
+
+.TP
 .B mode [\fInovice\fP|\fIstandard\fP|\fIadvanced\fP|\fIexpert\fP]
 The default operating mode for \fBreportbug(1)\fP.
 .TP
@@ -172,6 +184,12 @@ Disables querying the source packages for bugs.
 .B offline
 Disables all external queries.
 .TP
+.B paranoid
+Paranoid mode: print the whole email envelope before sending it
+.TP
+.B printonly
+Print the report on screen, don't sent it.
+.TP
 .B query-bts (\fIboolean\fP)
 Whether the BTS should be queried for existing bug reports.
 .TP
@@ -197,8 +215,8 @@ The default severity level of the bug reported.  Setting this in the
 configuration file will disable prompting while running
 \fBreportbug\fP.
 .TP
-.B sign [\fIgpg\fP|\fIpgp\fP]
-Program used to digitally sign bug reports automatically.
+.B sign [\fIgpg\fP|\fIpgp\fP|\fIgnupg\fP|\fInone\fP]
+Program used to digitally sign bug reports automatically ('none' to disable it).
 .TP
 .B smtphost
 Use an MTA different from \fB/usr/sbin/sendmail\fP.  A port number

-- 
Reportbug - reports bugs in the Debian distribution