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

[Michael Terry]

Use dh9 instead of cdbs, use --fail-missing, and install daemon into pkglibexecdir.

Modernize build system a bit:
 * Switch from cdbs to dh9 (which enables tests during build)
 * Use --fail-missing
 * Install daemon into pkglibexecdir instead of libexecdir

[Didier Roche-Tolomelli (didrocks)]

changes look good, pbuilder doesn't complain, and the "no test" runs well ;)
Approving.

review: Approve

=== modified file 'data/Makefile.am'
--- data/Makefile.am	2012-03-02 09:45:17 +0000
+++ data/Makefile.am	2012-11-08 22:52:20 +0000
@@ -3,7 +3,7 @@
 dbus_services_DATA = $(service_in_files:.service.in=.service)
 
 %.service: %.service.in
-	sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
+	sed -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@
 
 #############################################################
 # GSettings schemas

=== modified file 'data/unity-lens-files.service.in'
--- data/unity-lens-files.service.in	2011-08-11 14:06:59 +0000
+++ data/unity-lens-files.service.in	2012-11-08 22:52:20 +0000
@@ -1,3 +1,3 @@
 [D-BUS Service]
 Name=com.canonical.Unity.Lens.Files
-Exec=@libexecdir@/unity-files-daemon
+Exec=@pkglibexecdir@/unity-files-daemon

=== modified file 'debian/changelog'
--- debian/changelog	2012-11-06 15:39:07 +0000
+++ debian/changelog	2012-11-08 22:52:20 +0000
@@ -1,10 +1,14 @@
 unity-lens-files (6.6.0-0ubuntu2) UNRELEASED; urgency=low
 
+  * Install daemon into pkglibexecdir, not libexecdir
   * debian/control:
     - Update Vcs-Bzr
     - Build-Depend on gnome-common
+    - Bump required version of debhelper, drop cdbs
   * debian/rules:
     - Have dh_autoreconf call ./autogen.sh
+    - Switch from cdbs to dh9, running tests in the bargain
+    - Use --fail-missing
 
  -- Michael Terry <[e-mail]>  Tue, 06 Nov 2012 10:38:14 -0500
 

=== modified file 'debian/compat'
--- debian/compat	2010-06-18 14:45:04 +0000
+++ debian/compat	2012-11-08 22:52:20 +0000
@@ -1,1 +1,1 @@
-7
+9

=== modified file 'debian/control'
--- debian/control	2012-11-06 15:39:07 +0000
+++ debian/control	2012-11-08 22:52:20 +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.16),

=== modified file 'debian/rules'
--- debian/rules	2012-11-06 15:39:07 +0000
+++ debian/rules	2012-11-08 22:52:20 +0000
@@ -1,10 +1,13 @@
 #!/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
-
+# -*- Mode: Makefile; indent-tabs-mode: t -*-
+
+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

=== modified file 'src/Makefile.am'
--- src/Makefile.am	2012-03-23 14:06:10 +0000
+++ src/Makefile.am	2012-11-08 22:52:20 +0000
@@ -5,7 +5,7 @@
 
 DATADIR = $(datadir)
 
-libexec_PROGRAMS = \
+pkglibexec_PROGRAMS = \
   unity-files-daemon
 
 unity_files_daemon_CPPFLAGS = \