Nux

Merge lp:~fginther/nux/nux-2.0-libgeis-rename into lp:nux/2.0

Proposed by Francis Ginther on 2012-08-28
Status: Merged
Merged at revision: 618
Proposed branch: lp:~fginther/nux/nux-2.0-libgeis-rename
Merge into: lp:nux/2.0
Diff against target: 22 lines (+2/-2)
2 files modified
NuxGraphics/nux-graphics.pc.in (+1/-1)
configure.ac (+1/-1)
To merge this branch: bzr merge lp:~fginther/nux/nux-2.0-libgeis-rename
Reviewer Review Type Date Requested Status
Łukasz Zemczak 2012-08-28 Disapprove on 2012-09-07
Review via email: mp+121653@code.launchpad.net

Commit message

Updates build dependency on the renamed libgeis.

Description of the change

Updates dependency on the renamed libgeis.

The libutouch-geis project has been renamed to libgeis. Requires presence of libgeis-dev package.

Testing:
 - make
 - make check (no regressions)
 - Rebuilt unity (which uses the updated nux-graphics.pc.in)

To post a comment you must log in.
Francis Ginther (fginther) wrote :

Note: I've added a packaging branch containing the necessary packaging changes (and a patch to apply the dependency change covered here):

lp:~fginther/nux/precise-libgeis-rename-patch

Łukasz Zemczak (sil2100) wrote :

Already merged directly, no MRQ needed.

review: Disapprove

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'NuxGraphics/nux-graphics.pc.in'
2--- NuxGraphics/nux-graphics.pc.in 2011-11-01 15:45:05 +0000
3+++ NuxGraphics/nux-graphics.pc.in 2012-08-28 16:02:20 +0000
4@@ -9,4 +9,4 @@
5 Libs: -L${libdir} -lnux-graphics-@NUX_API_VERSION@
6 Cflags: -I${includedir}/Nux-@NUX_API_VERSION@
7
8-Requires: glib-2.0 nux-core-@NUX_API_VERSION@ nux-image-@NUX_API_VERSION@ @GL_PKGS@ xxf86vm xinerama libutouch-geis
9+Requires: glib-2.0 nux-core-@NUX_API_VERSION@ nux-image-@NUX_API_VERSION@ @GL_PKGS@ xxf86vm xinerama libgeis
10
11=== modified file 'configure.ac'
12--- configure.ac 2012-07-26 17:01:46 +0000
13+++ configure.ac 2012-08-28 16:02:20 +0000
14@@ -158,7 +158,7 @@
15 xxf86vm
16 sigc++-2.0
17 xinerama
18- libutouch-geis
19+ libgeis
20 )
21 AC_SUBST(NUX_GRAPHICS_CFLAGS)
22 AC_SUBST(NUX_GRAPHICS_LIBS)

Subscribers

People subscribed via source and target branches

to all changes: