Merge lp:~bregma/libgrip/lp-1082214 into lp:libgrip

Proposed by Stephen M. Webb
Status: Merged
Approved by: Christopher Townsend
Approved revision: 77
Merged at revision: 76
Proposed branch: lp:~bregma/libgrip/lp-1082214
Merge into: lp:libgrip
Diff against target: 25 lines (+2/-7)
2 files modified
debian/rules (+1/-6)
examples/rectangle-mover/Makefile.am (+1/-1)
To merge this branch: bzr merge lp:~bregma/libgrip/lp-1082214
Reviewer Review Type Date Requested Status
Christopher Townsend Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+159278@code.launchpad.net

Commit message

do not install example programs (lp: #1082214)

Description of the change

Make example programs no-install targets.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
lp:~bregma/libgrip/lp-1082214 updated
77. By Stephen M. Webb

debian/rules: removed workaround for previous change

Revision history for this message
Christopher Townsend (townsend) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/rules'
2--- debian/rules 2012-11-27 20:53:59 +0000
3+++ debian/rules 2013-04-17 14:38:25 +0000
4@@ -15,10 +15,5 @@
5 --enable-gtk-doc
6
7 override_dh_install:
8- find debian/tmp/usr/lib -name \*.la -delete
9- find debian/tmp/usr/lib -name \*.a -delete
10- find debian/tmp/usr/lib -name \*.pyc -delete
11- find debian/tmp/usr/lib -name \*.pyo -delete
12- rm -f debian/tmp/usr/bin/grip-test
13- dh_install --fail-missing
14+ dh_install --fail-missing -X.a -X.la -X.pyc -X.pyo
15
16
17=== modified file 'examples/rectangle-mover/Makefile.am'
18--- examples/rectangle-mover/Makefile.am 2011-10-19 14:05:35 +0000
19+++ examples/rectangle-mover/Makefile.am 2013-04-17 14:38:25 +0000
20@@ -1,4 +1,4 @@
21-bin_PROGRAMS = \
22+noinst_PROGRAMS = \
23 grip-test
24
25 grip_test_SOURCES = \

Subscribers

People subscribed via source and target branches