Indicator Display Objects

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

  1. fix-x-linking
  2. Merge into trunk.13.04
Proposed by Mathieu Trudel-Lapierre
Status: Merged
Approved by: Didier Roche-Tolomelli
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-Tolomelli Approve
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.
Revision history for this message
Didier Roche-Tolomelli (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
=== modified file 'debian/control'
--- debian/control 2013-01-04 11:18:51 +0000
+++ debian/control 2013-02-27 14:51:33 +0000
@@ -6,6 +6,8 @@
6 dh-autoreconf,6 dh-autoreconf,
7 gnome-common,7 gnome-common,
8 libxorg-gtest-dev,8 libxorg-gtest-dev,
9 libxi-dev,
10 libx11-dev,
9 libgtest-dev,11 libgtest-dev,
10 libglib2.0-dev (>=2.14.0),12 libglib2.0-dev (>=2.14.0),
11 libgtk-3-dev (>= 3.0),13 libgtk-3-dev (>= 3.0),
1214
=== modified file 'tests/Makefile.am'
--- tests/Makefile.am 2013-02-05 21:23:25 +0000
+++ tests/Makefile.am 2013-02-27 14:51:33 +0000
@@ -43,5 +43,6 @@
43gtest_menuitems_LDADD = \43gtest_menuitems_LDADD = \
44 $(GTK_LIBS) \44 $(GTK_LIBS) \
45 $(IDOLIB) \45 $(IDOLIB) \
46 libgtest.a46 libgtest.a \
47 -lX11 -lXi
4748

Subscribers

People subscribed via source and target branches