[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 5b1027804f779426774d9fb643c6e959c65c8bad
Author: Sandro Tosi <morph at debian.org>
Date:   Sat Aug 27 23:40:48 2011 +0200

    insert a greeting note in the bug report body template; thanks to martin f krafft for the report; Closes: #275660

diff --git a/debian/changelog b/debian/changelog
index afef891..0e7f1b8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ reportbug (6.2) UNRELEASED; urgency=low
     - remove the description from the dependencies list, leaving more space for
       the useful information (package name and version); thanks to Andreas
       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
   * debian/desktop
     - remove deprecated 'Application' category + add GenericName; thanks to Pino
       Toscano for the report and patch; Closes: #638964
@@ -44,7 +46,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 20:53:13 +0200
+ -- Sandro Tosi <morph at debian.org>  Sat, 27 Aug 2011 23:39:59 +0200
 
 reportbug (6.1) unstable; urgency=low
 
diff --git a/reportbug/utils.py b/reportbug/utils.py
index f7eee17..1b18503 100644
--- a/reportbug/utils.py
+++ b/reportbug/utils.py
@@ -73,7 +73,7 @@ import ui.text_ui as ui
 
 from reportbug.ui import AVAILABLE_UIS
 
-NEWBIELINE = '*** Please type your report below this line ***'
+NEWBIELINE = 'Dear Maintainer,\n*** Please type your report below this line ***'
 
 fhs_directories = ['/', '/usr', '/usr/share', '/var', '/usr/X11R6',
                    '/usr/man', '/usr/doc', '/usr/bin']
diff --git a/test/test_bugreport.py b/test/test_bugreport.py
index 6c0dffd..c3d2e62 100644
--- a/test/test_bugreport.py
+++ b/test/test_bugreport.py
@@ -1,5 +1,6 @@
 import unittest2
 
+from reportbug import utils
 from reportbug.bugreport import bugreport
 from nose.plugins.attrib import attr
 import debianbts
@@ -16,6 +17,7 @@ class TestBugreport(unittest2.TestCase):
 
         self.assertIn(self.body, self.text)
         self.assertIn(self.package, self.text)
+        self.assertIn(utils.NEWBIELINE, self.text)
 
     @attr('network') #marking the test as using network
     def test_followup(self):

-- 
Reportbug - reports bugs in the Debian distribution