Ubuntu
gupnp-ui package

Merge lp:~scarneiro/ubuntu/oneiric/gupnp-ui/fix-for-749152 into lp:ubuntu/oneiric/gupnp-ui

  1. Oneiric (11.10)
  2. fix-for-749152
  3. Merge into oneiric
Proposed by Sebastian Carneiro
Status: Merged
Merged at revision: 5
Proposed branch: lp:~scarneiro/ubuntu/oneiric/gupnp-ui/fix-for-749152
Merge into: lp:ubuntu/oneiric/gupnp-ui
Diff against target: 52 lines (+11/-2)
4 files modified
configure (+1/-0)
configure.ac (+1/-1)
debian/changelog (+7/-0)
debian/control (+2/-1)
To merge this branch: bzr merge lp:~scarneiro/ubuntu/oneiric/gupnp-ui/fix-for-749152
Reviewer Review Type Date Requested Status
Marc Deslauriers Approve
Ubuntu branches Pending
Review via email: mp+68552@code.launchpad.net

Description of the change

In configure and configure.ac the libgupnp libraries are added to LIBS variable, to avoid issues with indirect linking when using ld --no-add-needed.

To post a comment you must log in.
lp:~scarneiro/ubuntu/oneiric/gupnp-ui/fix-for-749152 updated
6. By Sebastian Carneiro

Maintainer fields updated.

Revision history for this message
Marc Deslauriers (mdeslaur) wrote :

Looks good. ACK!
Thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'configure'
2--- configure 2009-04-01 10:52:03 +0000
3+++ configure 2011-07-20 14:42:35 +0000
4@@ -20909,6 +20909,7 @@
5 else
6 LIBGUPNP_UI_CFLAGS=$pkg_cv_LIBGUPNP_UI_CFLAGS
7 LIBGUPNP_UI_LIBS=$pkg_cv_LIBGUPNP_UI_LIBS
8+ LIBS="$LIBS $LIBGUPNP_UI_LIBS"
9 { echo "$as_me:$LINENO: result: yes" >&5
10 echo "${ECHO_T}yes" >&6; }
11 :
12
13=== modified file 'configure.ac'
14--- configure.ac 2009-04-01 10:52:03 +0000
15+++ configure.ac 2011-07-20 14:42:35 +0000
16@@ -10,7 +10,7 @@
17 AC_STDC_HEADERS
18 AC_PROG_LIBTOOL
19
20-PKG_CHECK_MODULES(LIBGUPNP_UI, gupnp-1.0 >= 0.3 gtk+-2.0)
21+PKG_CHECK_MODULES(LIBGUPNP_UI, gupnp-1.0 >= 0.3 gtk+-2.0, LIBS="$LIBS $LIBGUPNP_UI_LIBS")
22
23 PKG_CHECK_MODULES(GTHREAD, gthread-2.0)
24
25
26=== modified file 'debian/changelog'
27--- debian/changelog 2009-09-26 13:39:55 +0000
28+++ debian/changelog 2011-07-20 14:42:35 +0000
29@@ -1,3 +1,10 @@
30+gupnp-ui (0.1.1-3ubuntu1) oneiric; urgency=low
31+
32+ * configure, configure.ac: add libgupnp libraries to LIBS in
33+ order to solve FTBFS with ld --no-add-needed (LP: #749152)
34+
35+ -- Sebastian Carneiro <scarneiro@fibertel.com.ar> Wed, 20 Jul 2011 09:50:52 -0300
36+
37 gupnp-ui (0.1.1-3) unstable; urgency=low
38
39 * Rebuild against new libgupnp
40
41=== modified file 'debian/control'
42--- debian/control 2009-09-26 13:39:55 +0000
43+++ debian/control 2011-07-20 14:42:35 +0000
44@@ -1,7 +1,8 @@
45 Source: gupnp-ui
46 Section: libs
47 Priority: optional
48-Maintainer: Ross Burton <ross@debian.org>
49+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
50+XSBC-Original-Maintainer: Ross Burton <ross@debian.org>
51 Build-Depends: debhelper (>= 5), cdbs, libgupnp-1.0-dev (>= 0.13), libgtk2.0-dev, uuid-dev
52 Standards-Version: 3.8.3
53

Subscribers

People subscribed via source and target branches