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

Proposed by Michael Terry
Status: Merged
Approved by: Didier Roche
Approved revision: 34
Merged at revision: 34
Proposed branch: lp:~mterry/unity-lens-shopping/modern-build
Merge into: lp:unity-lens-shopping
Diff against target: 61 lines (+8/-3)
5 files modified
data/Makefile.am (+1/-1)
data/unity-lens-shopping.service.in (+1/-1)
debian/changelog (+2/-0)
debian/rules (+3/-0)
src/Makefile.am (+1/-1)
To merge this branch: bzr merge lp:~mterry/unity-lens-shopping/modern-build
Reviewer Review Type Date Requested Status
Didier Roche Approve
PS Jenkins bot continuous-integration Pending
Review via email: mp+133580@code.launchpad.net

Commit message

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

Description of the change

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.

To post a comment you must log in.
Revision history for this message
Didier Roche (didrocks) wrote :

Looks excellently good :)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/Makefile.am'
2--- data/Makefile.am 2012-07-25 08:13:14 +0000
3+++ data/Makefile.am 2012-11-08 22:13:23 +0000
4@@ -6,7 +6,7 @@
5 dbus_services_DATA = $(service_in_files:.service.in=.service)
6
7 %.service: %.service.in
8- $(AM_V_GEN)sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
9+ $(AM_V_GEN)sed -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@
10
11 EXTRA_DIST = \
12 $(service_in_files)
13
14=== modified file 'data/unity-lens-shopping.service.in'
15--- data/unity-lens-shopping.service.in 2012-07-25 08:13:14 +0000
16+++ data/unity-lens-shopping.service.in 2012-11-08 22:13:23 +0000
17@@ -1,3 +1,3 @@
18 [D-BUS Service]
19 Name=com.canonical.Unity.Lens.Shopping
20-Exec=@libexecdir@/unity-shopping-daemon
21+Exec=@pkglibexecdir@/unity-shopping-daemon
22
23=== modified file 'debian/changelog'
24--- debian/changelog 2012-11-06 17:29:28 +0000
25+++ debian/changelog 2012-11-08 22:13:23 +0000
26@@ -1,10 +1,12 @@
27 unity-lens-shopping (6.8.0-0ubuntu2) UNRELEASED; urgency=low
28
29+ * Install daemon into pkglibexecdir, not libexecdir
30 * debian/control:
31 - Update Vcs-Bzr
32 - Build-Depend on dh-autoreconf, gnome-common
33 * debian/rules:
34 - Use dh_autoreconf to call ./autogen.sh
35+ - Use --fail-missing
36
37 -- Michael Terry <mterry@ubuntu.com> Tue, 06 Nov 2012 12:28:18 -0500
38
39
40=== modified file 'debian/rules'
41--- debian/rules 2012-11-06 17:29:28 +0000
42+++ debian/rules 2012-11-08 22:13:23 +0000
43@@ -11,3 +11,6 @@
44
45 override_dh_autoreconf:
46 NOCONFIGURE=1 dh_autoreconf ./autogen.sh
47+
48+override_dh_install:
49+ dh_install --fail-missing
50
51=== modified file 'src/Makefile.am'
52--- src/Makefile.am 2012-10-17 14:47:27 +0000
53+++ src/Makefile.am 2012-11-08 22:13:23 +0000
54@@ -5,7 +5,7 @@
55
56 DATADIR = $(datadir)
57
58-libexec_PROGRAMS = \
59+pkglibexec_PROGRAMS = \
60 unity-shopping-daemon \
61 $(NULL)
62

Subscribers

People subscribed via source and target branches

to all changes: