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

[Didier Roche-Tolomelli]

Use dh_python3 for python3 files, in addition of dh_python2 for python2 ones.

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.

[lp:~didrocks/dee/add_python_3]

383. By Didier Roche-Tolomelli on 2012-11-08

remove empty override

Unmerged revisions

=== modified file 'debian/changelog'
--- debian/changelog	2012-11-05 20:42:44 +0000
+++ debian/changelog	2012-11-08 07:39:24 +0000
@@ -1,7 +1,14 @@
 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
 

=== modified file 'debian/compat'
--- debian/compat	2010-05-25 15:16:55 +0000
+++ debian/compat	2012-11-08 07:39:24 +0000
@@ -1,1 +1,1 @@
-5
+9

=== modified file 'debian/control'
--- debian/control	2012-11-05 20:42:44 +0000
+++ debian/control	2012-11-08 07:39:24 +0000
@@ -2,10 +2,12 @@
 Priority: optional
 Maintainer: Ubuntu Developers <[e-mail]>
 XSBC-Original-Maintainer: Kartik Mistry <[e-mail]>
-Build-Depends: debhelper (>= 7.0.50),
+Build-Depends: dbus-test-runner,
+               debhelper (>= 9),
                dh-autoreconf,
                gir1.2-freedesktop,
                gir1.2-glib-2.0,
+               gnome-common,
                gobject-introspection (>= 0.10.2),
                gtk-doc-tools,
                libglib2.0-dev (>= 2.26.0),
@@ -25,6 +27,7 @@
 
 Package: libdee-1.0-4
 Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: model to synchronize mutiple instances over DBus - shared lib
  libdee is a shared library that provides objects that help

=== modified file 'debian/gir1.2-dee-1.0.install'
--- debian/gir1.2-dee-1.0.install	2011-12-07 11:35:57 +0000
+++ debian/gir1.2-dee-1.0.install	2012-11-08 07:39:24 +0000
@@ -1,2 +1,2 @@
-debian/tmp/usr/lib/girepository-1.0/
+debian/tmp/usr/lib/*/girepository-1.0/
 debian/tmp/usr/lib/python*/dist-packages/gi/overrides/*.py

=== modified file 'debian/libdee-1.0-4.install'
--- debian/libdee-1.0-4.install	2011-12-07 11:35:57 +0000
+++ debian/libdee-1.0-4.install	2012-11-08 07:39:24 +0000
@@ -1,1 +1,1 @@
-debian/tmp/usr/lib/lib*.so.*
+debian/tmp/usr/lib/*/lib*.so.*

=== modified file 'debian/libdee-dev.install'
--- debian/libdee-dev.install	2010-11-25 14:26:28 +0000
+++ debian/libdee-dev.install	2012-11-08 07:39:24 +0000
@@ -1,5 +1,5 @@
 debian/tmp/usr/include/*
-debian/tmp/usr/lib/lib*.so
-debian/tmp/usr/lib/pkgconfig/*
+debian/tmp/usr/lib/*/lib*.so
+debian/tmp/usr/lib/*/pkgconfig/*
 debian/tmp/usr/share/vala/vapi/*
 debian/tmp/usr/share/gir-1.0/*

=== modified file 'debian/rules'
--- debian/rules	2012-07-04 14:14:53 +0000
+++ debian/rules	2012-11-08 07:39:24 +0000
@@ -5,7 +5,10 @@
 #export DH_VERBOSE=1
 
 %:
-	dh --with python2 --with autoreconf $@
+	dh $@ --with python2,python3,autoreconf
+
+override_dh_autoreconf:
+	NOCONFIGURE=1 dh_autoreconf ./autogen.sh
 
 override_dh_auto_configure:
 	dh_auto_configure -- --enable-gtk-doc
@@ -14,11 +17,16 @@
 	# install the python3 gir override file as well
 	PYTHON=python3 ./configure --prefix=/usr
 	cd bindings/python/ && DESTDIR=../../debian/tmp make install && cd ../..
-	rm debian/tmp/usr/lib/*.la
+	rm debian/tmp/usr/lib/*/*.la
 	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_python2:
+	dh_python2
+
+override_dh_python3:
+	dh_python3 debian/gir1.2-dee-1.0/usr/lib/python3
 
 override_dh_gencontrol:
 	dh_girepository
@@ -27,6 +35,4 @@
 override_dh_strip:
 	dh_strip --dbg-package=libdee-1.0-4-dbg
 
-override_dh_auto_test:
-
 .PHONY: override_dh_strip