Merge lp:~matttbe/ubuntu/quantal/compiz/lp1013171 into lp:ubuntu/quantal/compiz

[Matthieu Baerts]

Hello Didier,

Here is another patch to update apport hook for python3.
Again I set you as reviewer because you're the latest commiter on the main branch and the version is still set as 'UNRELEASED' but I can add ubuntu-sponsors team if you want ;)

Have a nice day,

Matt

[Didier Roche-Tolomelli (didrocks)]

Looks good, same, pulling and pushing :)

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2012-06-29 07:50:37 +0000
+++ debian/changelog	2012-07-02 15:33:32 +0000
@@ -1,11 +1,15 @@
 compiz (1:0.9.8+bzr3249-0ubuntu3) UNRELEASED; urgency=low
 
+  [ Didier Roche ]
   * debian/patches/ubuntu-config.patch:
     - refresh with latest trunk
   * debian/*docs:
     - remove the TODO copy now removed upstream
 
- -- Didier Roche <[e-mail]>  Fri, 29 Jun 2012 09:23:25 +0200
+  [ Matthieu Baerts (matttbe) ]
+  * Update apport hook for python3 ; thanks to Edward Donovan (LP: #1013171)
+
+ -- Matthieu Baerts (matttbe) <[e-mail]>  Mon, 02 Jul 2012 17:24:40 +0200
 
 compiz (1:0.9.8+bzr3249-0ubuntu2) quantal; urgency=low
 

=== modified file 'debian/source_compiz.py'
--- debian/source_compiz.py	2012-06-19 11:22:48 +0000
+++ debian/source_compiz.py	2012-07-02 15:33:32 +0000
@@ -1,9 +1,10 @@
 import apport.packaging
+from apport.hookutils import *
 
 def add_info(report, ui):
 
     # if it's a stacktrace, report it directly against the right component
-    if report.has_key("Stacktrace"):
+    if "Stacktrace" in report:
         for external_component in ("/usr/lib/libnux", "/usr/lib/compiz/libunityshell", "/usr/lib/libunity"):
             for words in report["Stacktrace"].split():
                 if words.startswith(external_component):