Merge lp:~brian-murray/apport/add-apport-version into lp:~ubuntu-core-dev/ubuntu/oneiric/apport/ubuntu

[Brian Murray]

[Martin Pitt (pitti)]

Looks fine, thanks!

review: Approve

=== modified file 'data/general-hooks/ubuntu.py'
--- data/general-hooks/ubuntu.py	2011-09-01 10:10:53 +0000
+++ data/general-hooks/ubuntu.py	2011-09-08 17:59:17 +0000
@@ -25,6 +25,8 @@
 
     add_cloud_info(report)
 
+    report['ApportVersion'] = apport.packaging.get_version('apport')
+
     if report.get('ProblemType') == 'Package':
         check_for_disk_error(report)
 
 
=== modified file 'debian/changelog'
--- debian/changelog	2011-09-06 06:16:49 +0000
+++ debian/changelog	2011-09-08 17:59:17 +0000
@@ -1,3 +1,10 @@
+apport (1.22.1-0ubuntu2) oneiric; urgency=low
+
+  * data/general-hooks/ubuntu.py: include apport version in bug reports since
+    apport contains code for blocking bug reports and source package hooks
+
+ -- Brian Murray <[e-mail]>  Thu, 08 Sep 2011 09:17:12 -0700
+
 apport (1.22.1-0ubuntu1) oneiric; urgency=low
 
   [ Martin Pitt ]