Merge lp:~mterry/unity-lens-applications/modern-build into lp:unity-lens-applications

[Michael Terry]

Switch from cdbs to dh9 and run tests

Use a more modern build system for debian/:
 * Switch from cdbs to dh9
 * Use --fail-missing (not strictly needed, since we only have one binary package, but helps for future-proofing)
 * Automatically run tests due to dh9
 * Change from libexecdir to pkglibexecdir, now that dh9 fixes the long standing bug that set the wrong libexecdir

Note that debian/unity-lens-applications.install is dropped because dh9 automatically installs everything that the upstream build system does for you, as long as there is only one binary package. So the .install file is superfluous (and actually harmful as it causes a build problem).

[Didier Roche-Tolomelli (didrocks)]

Works completely fine.

review: Approve

=== modified file 'data/Makefile.am'
--- data/Makefile.am	2011-11-15 12:31:25 +0000
+++ data/Makefile.am	2012-11-08 04:51:21 +0000
@@ -6,7 +6,7 @@
 dbus_services_DATA = $(service_in_files:.service.in=.service)
 
 %.service: %.service.in
-	sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
+	sed -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@
 
 #############################################################
 # XDG Menu files

=== modified file 'data/unity-lens-applications.service.in'
--- data/unity-lens-applications.service.in	2011-08-04 07:04:35 +0000
+++ data/unity-lens-applications.service.in	2012-11-08 04:51:21 +0000
@@ -1,3 +1,3 @@
 [D-BUS Service]
 Name=com.canonical.Unity.Lens.Applications
-Exec=@libexecdir@/unity-applications-daemon
+Exec=@pkglibexecdir@/unity-applications-daemon

=== modified file 'debian/changelog'
--- debian/changelog	2012-11-08 04:51:21 +0000
+++ debian/changelog	2012-11-08 04:51:21 +0000
@@ -3,7 +3,11 @@
   * debian/control:
     - Update Vcs-Bzr
     - Bump required valac to 0.18
+    - Bump required debhelper to 9 and drop cdbs
     - Fix libgnome-menu-dev Build-Dep to be libgnome-menu-3-dev
+  * debian/rules:
+    - Use dh9 instead of cdbs
+    - Use --fail-missing
 
  -- Michael Terry <[e-mail]>  Wed, 07 Nov 2012 23:10:52 -0500
 

=== modified file 'debian/compat'
--- debian/compat	2010-06-23 09:51:59 +0000
+++ debian/compat	2012-11-08 04:51:21 +0000
@@ -1,1 +1,1 @@
-7
+9

=== modified file 'debian/control'
--- debian/control	2012-11-08 04:51:21 +0000
+++ debian/control	2012-11-08 04:51:21 +0000
@@ -2,8 +2,7 @@
 Section: gnome
 Priority: optional
 Maintainer: Ubuntu Developers <[e-mail]>
-Build-Depends: cdbs,
-               debhelper (>= 7),
+Build-Depends: debhelper (>= 9),
                gnome-common,
                pkg-config,
                valac-0.18 (>= 0.18.0),

=== modified file 'debian/rules'
--- debian/rules	2012-11-05 19:18:41 +0000
+++ debian/rules	2012-11-08 04:51:21 +0000
@@ -1,11 +1,12 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/class/gnome.mk
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/utils.mk
-include /usr/share/cdbs/1/rules/autoreconf.mk
-
-LDFLAGS += -Wl,-z,defs -Wl,--as-needed
-DEB_DH_AUTORECONF_ARGS = env -- NOCONFIGURE=1 ./autogen.sh
-DEB_CONFIGURE_EXTRA_FLAGS += --sysconfdir=/etc
-
+export DEB_LDFLAGS_MAINT_APPEND = -Wl,-z,defs -Wl,--as-needed
+
+%:
+	dh $@ --with autoreconf
+
+override_dh_autoreconf:
+	NOCONFIGURE=1 dh_autoreconf ./autogen.sh
+
+override_dh_install:
+	dh_install --fail-missing

=== removed file 'debian/unity-lens-applications.install'
--- debian/unity-lens-applications.install	2011-08-04 08:30:33 +0000
+++ debian/unity-lens-applications.install	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-etc/
-usr/

=== modified file 'src/Makefile.am'
--- src/Makefile.am	2012-11-05 19:18:41 +0000
+++ src/Makefile.am	2012-11-08 04:51:21 +0000
@@ -5,7 +5,7 @@
 
 DATADIR = $(datadir)
 
-libexec_PROGRAMS = \
+pkglibexec_PROGRAMS = \
   unity-applications-daemon
 
 unity_applications_daemon_CPPFLAGS = \