Merge lp:~didrocks/dee/add_python_3 into lp:dee

[Didier Roche-Tolomelli]

ensure python3 files are handled by dh_python3

Have the python3 files really processed with dh_python3 instead of dh_python2
I tried to remove the already existing dh_python2 -pgir1.2-dee-1.0
W: dh_python2:334: Python 3.x location detected, please use dh_python3: debian/gir1.2-dee-1.0/usr/lib/python3

Unfortunately, if we try to use dh_python2 debian/gir1.2-dee-1.0/usr/lib/python2.7, the pyshared and overriden directories are not created.
(explicit in dh_python2 code if a path is provided). Also, -X ".*python3.*" doesn't work. So living with the warning for now.

[Michael Terry (mterry)]

Looks like you forgot to set the pre-requisite branch, so your changes appear with mine.

[Michael Terry (mterry)]

You should drop the empty override for dh_python2. But besides that it looks fine.

review: Needs Fixing

[Michael Terry (mterry)]

+1

review: Approve

[Michael Terry (mterry)]

Whoops, also you should add python3 to Build-Depends

[Michael Terry (mterry)]

Guh, nevermind, I'm an idiot. It's already there.

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
No commit message was specified.

review: Needs Fixing (continuous-integration)

=== modified file 'debian/changelog'
--- debian/changelog	2012-11-08 14:47:32 +0000
+++ debian/changelog	2012-11-08 14:47:32 +0000
@@ -1,10 +1,15 @@
 dee (1.0.14-0ubuntu2) UNRELEASED; urgency=low
 
+  [ Michael Terry ]
   * debian/control:
     - Update Vcs-Bzr
   * debian/rules:
     - Update to dh9 and enable tests
 
+  [ Didier Roche ]
+  * debian/rules:
+    - Call dh_python3 for python3 suppport
+
  -- Michael Terry <[e-mail]>  Mon, 05 Nov 2012 15:28:38 -0500
 
 dee (1.0.14-0ubuntu1) quantal; urgency=low
 
=== modified file 'debian/rules'
--- debian/rules	2012-11-08 14:47:32 +0000
+++ debian/rules	2012-11-08 14:47:32 +0000
@@ -5,7 +5,7 @@
 #export DH_VERBOSE=1
 
 %:
-	dh $@ --with python2,autoreconf
+	dh $@ --with python2,python3,autoreconf
 
 override_dh_autoreconf:
 	NOCONFIGURE=1 dh_autoreconf ./autogen.sh
@@ -21,7 +21,9 @@
 	rm debian/tmp/usr/lib/python*/dist-packages/gi/overrides/*.pyc
 	rm debian/tmp/usr/lib/python*/dist-packages/gi/overrides/*.pyo
 	dh_install --fail-missing
-	dh_python2 -pgir1.2-dee-1.0
+
+override_dh_python3:
+	dh_python3 debian/gir1.2-dee-1.0/usr/lib/python3
 
 override_dh_gencontrol:
 	dh_girepository