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

[Sebastian Carneiro]

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.

[lp:~scarneiro/ubuntu/oneiric/gupnp-ui/fix-for-749152]

6. By Sebastian Carneiro on 2011-07-20

Maintainer fields updated.

[Marc Deslauriers (mdeslaur)]

Looks good. ACK!
Thanks!

review: Approve

=== modified file 'configure'
--- configure	2009-04-01 10:52:03 +0000
+++ configure	2011-07-20 14:42:35 +0000
@@ -20909,6 +20909,7 @@
 else
 	LIBGUPNP_UI_CFLAGS=$pkg_cv_LIBGUPNP_UI_CFLAGS
 	LIBGUPNP_UI_LIBS=$pkg_cv_LIBGUPNP_UI_LIBS
+	LIBS="$LIBS $LIBGUPNP_UI_LIBS"
         { echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6; }
 	:
 
=== modified file 'configure.ac'
--- configure.ac	2009-04-01 10:52:03 +0000
+++ configure.ac	2011-07-20 14:42:35 +0000
@@ -10,7 +10,7 @@
 AC_STDC_HEADERS
 AC_PROG_LIBTOOL
 
-PKG_CHECK_MODULES(LIBGUPNP_UI, gupnp-1.0 >= 0.3 gtk+-2.0)
+PKG_CHECK_MODULES(LIBGUPNP_UI, gupnp-1.0 >= 0.3 gtk+-2.0, LIBS="$LIBS $LIBGUPNP_UI_LIBS")
 
 PKG_CHECK_MODULES(GTHREAD, gthread-2.0)
 
 
=== modified file 'debian/changelog'
--- debian/changelog	2009-09-26 13:39:55 +0000
+++ debian/changelog	2011-07-20 14:42:35 +0000
@@ -1,3 +1,10 @@
+gupnp-ui (0.1.1-3ubuntu1) oneiric; urgency=low
+
+  * configure, configure.ac: add libgupnp libraries to LIBS in 
+    order to solve FTBFS with ld --no-add-needed (LP: #749152)
+
+ -- Sebastian Carneiro <[e-mail]>  Wed, 20 Jul 2011 09:50:52 -0300
+
 gupnp-ui (0.1.1-3) unstable; urgency=low
 
   * Rebuild against new libgupnp
 
=== modified file 'debian/control'
--- debian/control	2009-09-26 13:39:55 +0000
+++ debian/control	2011-07-20 14:42:35 +0000
@@ -1,7 +1,8 @@
 Source: gupnp-ui
 Section: libs
 Priority: optional
-Maintainer: Ross Burton <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Ross Burton <[e-mail]>
 Build-Depends: debhelper (>= 5), cdbs, libgupnp-1.0-dev (>= 0.13), libgtk2.0-dev, uuid-dev
 Standards-Version: 3.8.3