[Reportbug-commits] [SCM] Reportbug - reports bugs in the Debian distribution branch, master, updated. 4.2-32-g936ab25

[Sandro Tosi]

The following commit has been merged in the master branch:
commit 936ab2569cf29487d342757b301784931973e959
Merge: eb4d968b70dffedd579174bba649dc1c5b34f2ad f15fcd80370a6999e637184c99f65a95241cf0ce
Author: Sandro Tosi <morph at debian.org>
Date:   Thu May 21 17:42:59 2009 +0200

    fixed merge conflict

diff --combined debian/changelog
index 92ac386,12fe6db..1459610
--- a/debian/changelog
+++ b/debian/changelog
@@@ -32,11 -32,19 +32,22 @@@ reportbug (4.3) UNRELEASED; urgency=lo
    * reportbug/bugreport.py
      - decode UTF-8 body text to avoid encoding issues; thanks to nathael for the
        report and to Carl Chenet for the patch; Closes: #496210
 +  * doc/README.Users
 +    - added explanation about what modules are needed to let GTK+ UI works;
 +      thanks to Leonardo Meira for the report; Closes: #527994
+   * po4a/po/fr.po
+     - proof-read version of French manpage; thanks to Sylvain Cherrier for the
+       report and patch; Closes: #528956
+   * bin/reportbug, reportbug/{bugreport.py, utils.py}
+     - include debsums output into bug report; thanks to Michael Biebl for the
+       report and to Carl Chenet for the patch; Closes: #458572
+     - added debsums output also for --template (non interactive) executions
+   * debian/{control, rules}
+     - added '--install-layout=deb', to prepare for Python 2.6 introduction,
+       updating python requirements to >= 2.5; thanks to Kenneth E Drake for the
+       report and getting back to Debian; Closes: #529660
  
-  -- Sandro Tosi <morph at debian.org>  Mon, 11 May 2009 23:55:46 +0200
+  -- Sandro Tosi <morph at debian.org>  Thu, 21 May 2009 14:47:55 +0200
  
  reportbug (4.2) unstable; urgency=low
  

-- 
Reportbug - reports bugs in the Debian distribution