Merge lp:~jtaylor/ubuntu/oneiric/buzztard/fix-803173 into lp:ubuntu/oneiric/buzztard

[Julian Taylor]

fix ftbs

[Sebastien Bacher (seb128)]

Thank you for your work there

[Chase Douglas (chasedouglas)]

The fix looks good. When proposing package changes, please leave the distro as UNRELEASED instead of the real distro (i.e. oneiric). The uploader will flip UNRELEASED to the real distro before uploading.

We should wait a few days to see if the Debian maintainer will accept and upload a fix for this bug. If they do, then we can sync the package back to Oneiric. If not, we can upload this to Ubuntu. For now, I'm going to approve the merge proposal as I think the content is correct.

review: Approve

[Julian Taylor (jtaylor)]

the patch was forwarded to debian on 07 Jul 2011 with no answer yet.

[Fabrice Coutadeur (fabricesp)]

Merged. Thanks for your work! If Debian accepts the change, we can always request the sync later on.

Thanks!
Fabrice

=== modified file 'debian/changelog'
--- debian/changelog	2011-03-28 21:26:12 +0000
+++ debian/changelog	2011-08-21 14:22:24 +0000
@@ -1,3 +1,10 @@
+buzztard (0.5.0-4ubuntu1) oneiric; urgency=low
+
+  * debian/patches/04_fix-as-needed-build.patch:
+    - fix build with ld --as-needed (LP: #803173)
+
+ -- Julian Taylor <[e-mail]>  Sun, 21 Aug 2011 16:12:21 +0200
+
 buzztard (0.5.0-4) unstable; urgency=low
 
   * Team upload.

=== modified file 'debian/control'
--- debian/control	2011-03-28 21:26:12 +0000
+++ debian/control	2011-08-21 14:22:24 +0000
@@ -1,7 +1,8 @@
 Source: buzztard
 Section: sound
 Priority: optional
-Maintainer: Maintainers of GStreamer packages <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Maintainers of GStreamer packages <[e-mail]>
 Uploaders: Sebastian Dröge <[e-mail]>
 Build-Depends: cdbs,
                debhelper (>= 7), 

=== added file 'debian/patches/04_fix-as-needed-build.patch'
--- debian/patches/04_fix-as-needed-build.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/04_fix-as-needed-build.patch	2011-08-21 14:22:24 +0000
@@ -0,0 +1,72 @@
+Description: fix build with ld --as-needed
+ when building with ld --as-needed libraries must be placed
+ after object files needing them on the command line so the symbols
+ of the libraries are registered as needed.
+Author: Julian Taylor <[e-mail]>
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/buzztard/+bug/803173
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=632956
+Index: buzztard-0.5.0/docs/reference/bt-cmd/Makefile.in
+===================================================================
+--- buzztard-0.5.0.orig/docs/reference/bt-cmd/Makefile.in	2009-07-31 09:47:38.000000000 +0200
++++ buzztard-0.5.0/docs/reference/bt-cmd/Makefile.in	2011-07-07 13:34:50.473977021 +0200
+@@ -332,9 +332,9 @@
+ 	$(BT_CFLAGS)
+ 
+ GTKDOC_LIBS = \
++	$(top_builddir)/src/ui/cmd/libbtcmd.la \
+ 	$(top_builddir)/src/lib/core/libbuzztard-core.la \
+ 	$(top_builddir)/src/lib/ic/libbuzztard-ic.la \
+-	$(top_builddir)/src/ui/cmd/libbtcmd.la \
+ 	$(BASE_DEPS_LIBS) \
+ 	$(BT_LIBS)
+ 
+Index: buzztard-0.5.0/docs/reference/bt-edit/Makefile.in
+===================================================================
+--- buzztard-0.5.0.orig/docs/reference/bt-edit/Makefile.in	2009-07-31 09:47:38.000000000 +0200
++++ buzztard-0.5.0/docs/reference/bt-edit/Makefile.in	2011-07-07 13:34:50.483977021 +0200
+@@ -337,9 +337,9 @@
+ 	$(BT_CFLAGS)
+ 
+ GTKDOC_LIBS = \
++	$(top_builddir)/src/ui/edit/libbtedit.la \
+ 	$(top_builddir)/src/lib/core/libbuzztard-core.la \
+ 	$(top_builddir)/src/lib/ic/libbuzztard-ic.la \
+-	$(top_builddir)/src/ui/edit/libbtedit.la \
+ 	$(BASE_DEPS_LIBS) \
+ 	$(GUI_DEPS_LIBS) \
+         	$(BT_LIBS)
+Index: buzztard-0.5.0/src/ui/edit/Makefile.in
+===================================================================
+--- buzztard-0.5.0.orig/src/ui/edit/Makefile.in	2009-07-31 09:47:41.000000000 +0200
++++ buzztard-0.5.0/src/ui/edit/Makefile.in	2011-07-07 13:34:50.483977021 +0200
+@@ -324,10 +324,11 @@
+ top_srcdir = @top_srcdir@
+ with_desktop_dir = @with_desktop_dir@
+ xvfb_path = @xvfb_path@
+-buzztard_edit_LDADD = $(BASE_DEPS_LIBS) $(GUI_DEPS_LIBS) $(BT_LIBS) $(LIBINTL) \
++buzztard_edit_LDADD =  \
+ 	$(top_builddir)/src/lib/core/libbuzztard-core.la \
+ 	$(top_builddir)/src/lib/ic/libbuzztard-ic.la \
+-	libbtedit.la
++	libbtedit.la \
++	$(BASE_DEPS_LIBS) $(GUI_DEPS_LIBS) $(BT_LIBS) $(LIBINTL)
+ 
+ buzztard_edit_SOURCES = \
+ 	bt-edit.c bt-edit.h
+Index: buzztard-0.5.0/src/ui/cmd/Makefile.in
+===================================================================
+--- buzztard-0.5.0.orig/src/ui/cmd/Makefile.in	2011-07-07 13:35:37.383977049 +0200
++++ buzztard-0.5.0/src/ui/cmd/Makefile.in	2011-07-07 13:35:48.613977057 +0200
+@@ -288,9 +288,10 @@
+ top_srcdir = @top_srcdir@
+ with_desktop_dir = @with_desktop_dir@
+ xvfb_path = @xvfb_path@
+-buzztard_cmd_LDADD = $(BASE_DEPS_LIBS) $(BT_LIBS) $(LIBINTL) \
++buzztard_cmd_LDADD =  \
+ 	$(top_builddir)/src/lib/core/libbuzztard-core.la \
+-	libbtcmd.la
++	libbtcmd.la \
++	$(BASE_DEPS_LIBS) $(BT_LIBS) $(LIBINTL)
+ 
+ buzztard_cmd_SOURCES = \
+ 	bt-cmd.c bt-cmd.h

=== modified file 'debian/patches/series'
--- debian/patches/series	2010-04-21 13:30:20 +0000
+++ debian/patches/series	2011-08-21 14:22:24 +0000
@@ -1,3 +1,4 @@
 01_COPYING-LGPL.patch
 02_var_args-copy.patch
 03_omf-dir.patch
+04_fix-as-needed-build.patch