Merge lp:~cyphermox/ido/fix-x-linking into lp:ido/13.04

Proposed by Mathieu Trudel-Lapierre on 2013-02-27
Status: Merged
Approved by: Didier Roche on 2013-02-27
Approved revision: 125
Merged at revision: 125
Proposed branch: lp:~cyphermox/ido/fix-x-linking
Merge into: lp:ido/13.04
Diff against target: 23 lines (+4/-1)
2 files modified
debian/control (+2/-0)
tests/Makefile.am (+2/-1)
To merge this branch: bzr merge lp:~cyphermox/ido/fix-x-linking
Reviewer Review Type Date Requested Status
Didier Roche 2013-02-27 Approve on 2013-02-27
PS Jenkins bot continuous-integration Pending
Review via email: mp+150815@code.launchpad.net

Description of the change

Fix linking against X11 and Xi which xorg-gtest now seems to require. I'll fix xorg-gtest directly too (in progress), but this is to avoid blocking builds and daily release.

To post a comment you must log in.
Didier Roche (didrocks) wrote :

Excellent! Now fixed, tested in pbuilder :)

Thanks Mathieu

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/control'
2--- debian/control 2013-01-04 11:18:51 +0000
3+++ debian/control 2013-02-27 14:51:33 +0000
4@@ -6,6 +6,8 @@
5 dh-autoreconf,
6 gnome-common,
7 libxorg-gtest-dev,
8+ libxi-dev,
9+ libx11-dev,
10 libgtest-dev,
11 libglib2.0-dev (>=2.14.0),
12 libgtk-3-dev (>= 3.0),
13
14=== modified file 'tests/Makefile.am'
15--- tests/Makefile.am 2013-02-05 21:23:25 +0000
16+++ tests/Makefile.am 2013-02-27 14:51:33 +0000
17@@ -43,5 +43,6 @@
18 gtest_menuitems_LDADD = \
19 $(GTK_LIBS) \
20 $(IDOLIB) \
21- libgtest.a
22+ libgtest.a \
23+ -lX11 -lXi
24

Subscribers

People subscribed via source and target branches