[Reportbug-commits] [SCM] Reportbug - reports bugs in the Debian distribution branch, master, updated. 4.9-155-ge2121b6

[Sandro Tosi]

The following commit has been merged in the master branch:
commit e2121b6ce959f1b0b115a1b20eeb4e802d6ce9b6
Author: Sandro Tosi <morph at debian.org>
Date:   Mon Jan 3 15:34:19 2011 +0100

    don't specify 'ITP' when warning a WNPP bug has lines unchanged from the template; thanks to Jonas Stein for the report; Closes: #598161

diff --git a/bin/reportbug b/bin/reportbug
index 14caea6..420e6b0 100755
--- a/bin/reportbug
+++ b/bin/reportbug
@@ -211,7 +211,7 @@ def handle_editing(filename, dmessage, options, sendto, attachments, package,
                 if itp_line in message and itp_line != '':
                     ewrite("Wrong line: %s\n", itp_line)
                     menuopts = "Eq"
-                    prompt = 'ERROR: you have composed an ITP with fields unchanged from the template; this will NOT be submitted. You should edit all fields so they contain correct values for your ITP (e to edit)'
+                    prompt = 'ERROR: you have composed a WNPP bug report with fields unchanged from the template; this will NOT be submitted. Please edit all fields so they contain correct values (e to edit)'
 
         if options.outfile:
             yesmessage = 'Save the report into %s .' % options.outfile
diff --git a/debian/changelog b/debian/changelog
index bec79e4..a3734a6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -30,8 +30,11 @@ reportbug (4.99.0) UNRELEASED; urgency=low
   * add feature to retrieve a mbox of a bug report and open it in a MUA; thanks
     to Josh Triplett for the report and to Rafael Cunha de Almeida for the
     patch; Closes: #458735
+  * bin/reportbug
+    - don't specify 'ITP' when warning a WNPP bug has lines unchanged from the
+      template; thanks to Jonas Stein for the report; Closes: #598161
 
- -- Sandro Tosi <morph at debian.org>  Sun, 02 Jan 2011 18:09:18 +0100
+ -- Sandro Tosi <morph at debian.org>  Mon, 03 Jan 2011 15:31:05 +0100
 
 reportbug (4.12.6) unstable; urgency=low
 

-- 
Reportbug - reports bugs in the Debian distribution