[SCM] rosegarden packaging branch, master, updated. debian/1.7.3-1.1-11-g20345eb

[themill-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit f928102e50f970c3c2c81c5ca31028aba72a4329
Author: Stuart Prescott <stuart+debian at nanonanonano.net>
Date:   Wed Mar 31 17:12:27 2010 +0100

    Explicitly link against libz, libdl and libX11 (Closes: #556326)
    
      * Add linker-binutils-gold.patch to link against additional libraries to
        prevent FTBFS with binutils-gold

diff --git a/debian/patches/linker-binutils-gold.patch b/debian/patches/linker-binutils-gold.patch
new file mode 100644
index 0000000..00cdf2f
--- /dev/null
+++ b/debian/patches/linker-binutils-gold.patch
@@ -0,0 +1,24 @@
+Description: explicitly link against used libraries for binutils-gold
+ The rosegarden source makes use of symbols without directly linking to the
+ libraries that provide these symbols. This causes an FTBFS with binutils-gold.
+ .
+ Missing symbols:
+   src/document/GzipFile.o:
+      gzopen, gzwrite, gzclose, gzgets, gzeof => -lz
+   src/sound/DSSIPluginFactory.o:
+      dlsym, dlopen, dlclose, dlerror         => -ldl
+   src/gui/application/main.o:
+      XGetErrorText                           => -lX11
+Author: Stuart Prescott <stuart+debian at nanonanonano.net>
+--- rosegarden.orig/Makefile.in
++++ rosegarden/Makefile.in
+@@ -54,6 +54,9 @@
+ 		   @fftw3f_LIBS@ \
+ 		   @samplerate_LIBS@ \
+ 		   @sndfile_LIBS@ \
++		   -lz \
++		   -ldl \
++		   -lX11 \
+ 		   @LIBS@
+ 
+ INSTBINDIR	:= $(DESTDIR)$(PREFIX)/bin
diff --git a/debian/patches/series b/debian/patches/series
index 59070f0..d931040 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 make-clean.patch
+linker-binutils-gold.patch

-- 
rosegarden packaging