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

[Sandro Tosi]

The following commit has been merged in the master branch:
commit 3791c83f4133b192b7f11eb91e7de71dcab096d0
Author: Sandro Tosi <morph at debian.org>
Date:   Sat Aug 27 23:58:40 2011 +0200

    expand the bug report body template to include some guiding questions for less experienced reporters; thanks to Enrico Zini for the report and the proposed questions; Closes: #321623

diff --git a/debian/changelog b/debian/changelog
index 0e7f1b8..478b29a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,9 @@ reportbug (6.2) UNRELEASED; urgency=low
       Beckmann for the report; Closes: #582218
     - insert a greeting note in the bug report body template; thanks to martin f
       krafft for the report; Closes: #275660
+    - expand the bug report body template to include some guiding questions for
+      less experienced reporters; thanks to Enrico Zini for the report and the
+      proposed questions; Closes: #321623
   * debian/desktop
     - remove deprecated 'Application' category + add GenericName; thanks to Pino
       Toscano for the report and patch; Closes: #638964
@@ -46,7 +49,7 @@ reportbug (6.2) UNRELEASED; urgency=low
   * reportbug/checkbuildd.py
     - fix buildd.d.o checks after the service changes layout; Closes: #612520
 
- -- Sandro Tosi <morph at debian.org>  Sat, 27 Aug 2011 23:39:59 +0200
+ -- Sandro Tosi <morph at debian.org>  Sat, 27 Aug 2011 23:57:24 +0200
 
 reportbug (6.1) unstable; urgency=low
 
diff --git a/reportbug/utils.py b/reportbug/utils.py
index 1b18503..17b9b27 100644
--- a/reportbug/utils.py
+++ b/reportbug/utils.py
@@ -73,7 +73,16 @@ import ui.text_ui as ui
 
 from reportbug.ui import AVAILABLE_UIS
 
-NEWBIELINE = 'Dear Maintainer,\n*** Please type your report below this line ***'
+NEWBIELINE = """Dear Maintainer,
+*** Please consider answering these questions, where appropiate ***
+
+   * What led up to the situation?
+   * What exactly did you do (or not do) that was effective (or
+     ineffective)?
+   * What was the outcome of this action?
+   * What outcome did you expect instead?
+
+*** End of the template - remove these lines ***"""
 
 fhs_directories = ['/', '/usr', '/usr/share', '/var', '/usr/X11R6',
                    '/usr/man', '/usr/doc', '/usr/bin']

-- 
Reportbug - reports bugs in the Debian distribution