[Pkg-bluetooth-commits] r1204 - in /packages/bluez-tools/trunk/debian: changelog control patches/ patches/01_ld-as-needed.patch patches/series

Wed Mar 21 03:30:07 UTC 2012

Author: iwamatsu
Date: Wed Mar 21 03:30:06 2012
New Revision: 1204

URL: http://svn.debian.org/wsvn/pkg-bluetooth/?sc=1&rev=1204
Log:
Fix FTBFS with "ld --as-needed" (Closes: #625984)

Added:
    packages/bluez-tools/trunk/debian/patches/
    packages/bluez-tools/trunk/debian/patches/01_ld-as-needed.patch
    packages/bluez-tools/trunk/debian/patches/series
Modified:
    packages/bluez-tools/trunk/debian/changelog
    packages/bluez-tools/trunk/debian/control

Modified: packages/bluez-tools/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-bluetooth/packages/bluez-tools/trunk/debian/changelog?rev=1204&op=diff
==============================================================================

--- packages/bluez-tools/trunk/debian/changelog (original)
+++ packages/bluez-tools/trunk/debian/changelog Wed Mar 21 03:30:06 2012
@@ -6,8 +6,10 @@
   * Update debian/control.
     - Dump Standards-Version to 3.9.2.
     - Update package description.
+  * Fix linking with "ld --as-needed" (Closes: #625984).
+    - Add debian/patches/01_ld-as-needed.patch.
 
- -- Nobuhiro Iwamatsu <iwamatsu at debian.org>  Thu, 27 Oct 2011 12:39:05 +0900
+ -- Nobuhiro Iwamatsu <iwamatsu at debian.org>  Wed, 21 Mar 2012 12:29:09 +0900
 
 bluez-tools (0.1.38+git662e-2) unstable; urgency=low
 

Modified: packages/bluez-tools/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-bluetooth/packages/bluez-tools/trunk/debian/control?rev=1204&op=diff
==============================================================================
--- packages/bluez-tools/trunk/debian/control (original)
+++ packages/bluez-tools/trunk/debian/control Wed Mar 21 03:30:06 2012
@@ -5,7 +5,7 @@
 Uploaders: Nobuhiro Iwamatsu <iwamatsu at debian.org>
 Build-Depends: debhelper (>= 7.0.50~), autotools-dev, libbluetooth-dev (>= 4.69),
     libreadline-dev, libdbus-1-dev, libdbus-glib-1-dev
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
 Homepage: http://code.google.com/p/bluez-tools/
 
 Package: bluez-tools

Added: packages/bluez-tools/trunk/debian/patches/01_ld-as-needed.patch
URL: http://svn.debian.org/wsvn/pkg-bluetooth/packages/bluez-tools/trunk/debian/patches/01_ld-as-needed.patch?rev=1204&op=file
==============================================================================
--- packages/bluez-tools/trunk/debian/patches/01_ld-as-needed.patch (added)
+++ packages/bluez-tools/trunk/debian/patches/01_ld-as-needed.patch Wed Mar 21 03:30:06 2012
@@ -1,0 +1,48 @@
+Description: Fix FTBFS with "ld --as-needed".
+Forwarded: none
+Bug-Debian: http://bugs.debian.org/625984
+Author: Michael Bienia <geser at ubuntu.com>
+Last-Update: 2012-03-21
+
+Index: bluez-tools-0.1.38+git662e/src/Makefile.am
+===================================================================
+--- bluez-tools-0.1.38+git662e.orig/src/Makefile.am	2011-05-07 17:06:38.000000000 +0200
++++ bluez-tools-0.1.38+git662e/src/Makefile.am	2011-05-07 17:07:10.000000000 +0200
+@@ -1,5 +1,5 @@
+ AM_CPPFLAGS = $(DBUS_CFLAGS) $(GLIB_CFLAGS) $(DBUS_GLIB_CFLAGS)
+-AM_LDFLAGS = $(DBUS_LIBS) $(GLIB_LIBS) $(DBUS_GLIB_LIBS)
++LDADD = $(DBUS_LIBS) $(GLIB_LIBS) $(DBUS_GLIB_LIBS)
+ 
+ # Marshallers generation
+ #BUILT_SOURCES = lib/marshallers.c lib/marshallers.h
+@@ -57,7 +57,7 @@
+ if OBEX
+ bin_PROGRAMS += bt-obex
+ bt_obex_SOURCES = $(lib_sources) $(bluez_sources) $(obexd_sources) bt-obex.c
+-bt_obex_LDADD = $(LIBREADLINE)
++bt_obex_LDADD = $(LDADD) $(LIBREADLINE)
+ endif
+ 
+ dist_man_MANS = bt-monitor.1 bt-adapter.1 bt-agent.1 bt-device.1 bt-input.1 bt-audio.1 bt-network.1 bt-serial.1
+Index: bluez-tools-0.1.38+git662e/src/Makefile.in
+===================================================================
+--- bluez-tools-0.1.38+git662e.orig/src/Makefile.in	2011-05-07 17:07:16.000000000 +0200
++++ bluez-tools-0.1.38+git662e/src/Makefile.in	2011-05-07 17:07:58.000000000 +0200
+@@ -419,7 +419,7 @@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ AM_CPPFLAGS = $(DBUS_CFLAGS) $(GLIB_CFLAGS) $(DBUS_GLIB_CFLAGS)
+-AM_LDFLAGS = $(DBUS_LIBS) $(GLIB_LIBS) $(DBUS_GLIB_LIBS)
++LDADD = $(DBUS_LIBS) $(GLIB_LIBS) $(DBUS_GLIB_LIBS)
+ 
+ # Marshallers generation
+ #BUILT_SOURCES = lib/marshallers.c lib/marshallers.h
+@@ -462,7 +462,7 @@
+ bt_network_SOURCES = $(lib_sources) $(bluez_sources) $(obexd_sources) bt-network.c
+ bt_serial_SOURCES = $(lib_sources) $(bluez_sources) $(obexd_sources) bt-serial.c
+ @OBEX_TRUE at bt_obex_SOURCES = $(lib_sources) $(bluez_sources) $(obexd_sources) bt-obex.c
+- at OBEX_TRUE@bt_obex_LDADD = $(LIBREADLINE)
++ at OBEX_TRUE@bt_obex_LDADD = $(LDADD) $(LIBREADLINE)
+ dist_man_MANS = bt-monitor.1 bt-adapter.1 bt-agent.1 bt-device.1 \
+ 	bt-input.1 bt-audio.1 bt-network.1 bt-serial.1 $(am__append_3)
+ all: all-am

Added: packages/bluez-tools/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-bluetooth/packages/bluez-tools/trunk/debian/patches/series?rev=1204&op=file
==============================================================================
--- packages/bluez-tools/trunk/debian/patches/series (added)
+++ packages/bluez-tools/trunk/debian/patches/series Wed Mar 21 03:30:06 2012
@@ -1,0 +1,1 @@
+01_ld-as-needed.patch


