Merge lp:~mterry/dee/modern-build into lp:dee

[Michael Terry]

Switch debian/ to debhelper 9

Here's a branch to modernize debian/:

* Switch to dh9
  * Use multiarch
* Enable tests
* Use upstream ./autogen.sh instead of autoreconf

[Didier Roche (didrocks)]

oupsss, my bad for compat not being bumped before (feels ashamed)

All looks good both source-wise and in my pbuilder. Approving. (Even the Pre-depends is there for the new multiarch support! ;)).

There is just a small warning I want to fix, this is coming in a new MP.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/dee-mbs-autolanding/1/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/dee-mbs-autolanding/./build=pbuilder,distribution=quantal,flavor=amd64/1/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/dee-mbs-autolanding/./build=pbuilder,distribution=quantal,flavor=i386/1/console

review: Needs Fixing (continuous-integration)

[Francis Ginther (fginther)]

Build failed due to jenkins job config error. Fixed and re-approving.

=== modified file 'debian/changelog'
--- debian/changelog	2012-11-05 20:42:44 +0000
+++ debian/changelog	2012-11-07 20:51:22 +0000
@@ -2,6 +2,8 @@
 
   * debian/control:
     - Update Vcs-Bzr
+  * debian/rules:
+    - Update to dh9 and enable tests
 
  -- 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-07 20:51:22 +0000
@@ -1,1 +1,1 @@
-5
+9

=== modified file 'debian/control'
--- debian/control	2012-11-05 20:42:44 +0000
+++ debian/control	2012-11-07 20:51:22 +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-07 20:51:22 +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-07 20:51:22 +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-07 20:51:22 +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-07 20:51:22 +0000
@@ -5,7 +5,10 @@
 #export DH_VERBOSE=1
 
 %:
-	dh --with python2 --with autoreconf $@
+	dh $@ --with python2,autoreconf
+
+override_dh_autoreconf:
+	NOCONFIGURE=1 dh_autoreconf ./autogen.sh
 
 override_dh_auto_configure:
 	dh_auto_configure -- --enable-gtk-doc
@@ -14,7 +17,7 @@
 	# 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
@@ -27,6 +30,4 @@
 override_dh_strip:
 	dh_strip --dbg-package=libdee-1.0-4-dbg
 
-override_dh_auto_test:
-
 .PHONY: override_dh_strip