Merge lp:~matttbe/ubuntu/quantal/indicator-applet/lp1013171 into lp:ubuntu/quantal/indicator-applet

[Matthieu Baerts]

Hello Indicator-Applet team,

This is just a patch to update apport hook for python3.
I set you as reviewer but I can add ubuntu-sponsors team if you want ;)

Regards,

Matt

[lp:~matttbe/ubuntu/quantal/indicator-applet/lp1013171]

53. By Matthieu Baerts on 2012-07-05

* debian/control:
 - Added python3-xdg as new dependence (needed by its apport hook)

54. By Matthieu Baerts on 2012-07-05

Apport Hook: Added 'from __future__ import print_function' to be compatible with python 2

[Matthieu Baerts (matttbe)]

python3-xdg is now available, we can still use 'from xdg.BaseDirectory import xdg_cache_home' but now python3-xdg is needed.

=== modified file 'debian/changelog'
--- debian/changelog	2012-04-04 14:40:07 +0000
+++ debian/changelog	2012-07-05 15:17:17 +0000
@@ -1,3 +1,12 @@
+indicator-applet (0.5.0-0ubuntu2) UNRELEASED; urgency=low
+
+  * debian/source_indicator-applet.py:
+   - Update apport hook for python3 (LP: #1013171)
+  * debian/control:
+   - Added python3-xdg as new dependence (needed by its apport hook) 
+
+ -- Matthieu Baerts (matttbe) <[e-mail]>  Mon, 02 Jul 2012 19:22:45 +0200
+
 indicator-applet (0.5.0-0ubuntu1) precise; urgency=low
 
   * New upstream release.

=== modified file 'debian/control'
--- debian/control	2012-03-16 09:59:10 +0000
+++ debian/control	2012-07-05 15:17:17 +0000
@@ -22,7 +22,8 @@
 Package: indicator-applet
 Architecture: any
 Depends: ${shlibs:Depends},
-         ${misc:Depends}
+         ${misc:Depends},
+         python3-xdg
 Recommends: indicator-messages,
             indicator-sound,
             indicator-application

=== modified file 'debian/source_indicator-applet.py'
--- debian/source_indicator-applet.py	2011-03-16 09:52:58 +0000
+++ debian/source_indicator-applet.py	2012-07-05 15:17:17 +0000
@@ -1,3 +1,4 @@
+from __future__ import print_function
 import os.path
 from apport.hookutils import *
 from xdg.BaseDirectory import xdg_cache_home
@@ -35,7 +36,7 @@
         if response[0] == 8: # the issue is with indicator-application
             report.add_package_info("indicator-application")
     except:
-        print 'Unfortunately, that package is not installed. Please refer to https://wiki.ubuntu.com/Bugs/FindRightPackage'
+        print('Unfortunately, that package is not installed. Please refer to https://wiki.ubuntu.com/Bugs/FindRightPackage')
 
     attach_file_if_exists(report, APPLET_LOG, 'indicator-applet.log')
     attach_file_if_exists(report, APPLET_SESSION_LOG, 'indicator-applet-session.log')