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

[Michael Terry]

Use --fail-missing and install daemon into pkglibexecdir.

A couple small changes to standardize the build:
* Use --fail-missing, despite it not really mattering since this is a single binary package. Still, future-proofing.
* Install the daemon into pkglibexecdir, instead of libexecdir.

[Didier Roche-Tolomelli (didrocks)]

Looks excellently good :)

review: Approve

=== modified file 'data/Makefile.am'
--- data/Makefile.am	2012-07-25 08:13:14 +0000
+++ data/Makefile.am	2012-11-08 22:13:23 +0000
@@ -6,7 +6,7 @@
 dbus_services_DATA = $(service_in_files:.service.in=.service)
 
 %.service: %.service.in
-	$(AM_V_GEN)sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
+	$(AM_V_GEN)sed -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@
 
 EXTRA_DIST = \
   $(service_in_files)
 
=== modified file 'data/unity-lens-shopping.service.in'
--- data/unity-lens-shopping.service.in	2012-07-25 08:13:14 +0000
+++ data/unity-lens-shopping.service.in	2012-11-08 22:13:23 +0000
@@ -1,3 +1,3 @@
 [D-BUS Service]
 Name=com.canonical.Unity.Lens.Shopping
-Exec=@libexecdir@/unity-shopping-daemon
+Exec=@pkglibexecdir@/unity-shopping-daemon
 
=== modified file 'debian/changelog'
--- debian/changelog	2012-11-06 17:29:28 +0000
+++ debian/changelog	2012-11-08 22:13:23 +0000
@@ -1,10 +1,12 @@
 unity-lens-shopping (6.8.0-0ubuntu2) UNRELEASED; urgency=low
 
+  * Install daemon into pkglibexecdir, not libexecdir
   * debian/control:
     - Update Vcs-Bzr
     - Build-Depend on dh-autoreconf, gnome-common
   * debian/rules:
     - Use dh_autoreconf to call ./autogen.sh
+    - Use --fail-missing
 
  -- Michael Terry <[e-mail]>  Tue, 06 Nov 2012 12:28:18 -0500
 
 
=== modified file 'debian/rules'
--- debian/rules	2012-11-06 17:29:28 +0000
+++ debian/rules	2012-11-08 22:13:23 +0000
@@ -11,3 +11,6 @@
 
 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-10-17 14:47:27 +0000
+++ src/Makefile.am	2012-11-08 22:13:23 +0000
@@ -5,7 +5,7 @@
 
 DATADIR = $(datadir)
 
-libexec_PROGRAMS = \
+pkglibexec_PROGRAMS = \
   unity-shopping-daemon \
   $(NULL)