[SCM] csound/master: Imported Debian patch 1:5.13.0~dfsg-3.1

[fsateler at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit e8dd9261b3f78990e4b003f77c265545e2d3b3f5
Author: Jakub Wilk <jwilk at debian.org>
Date:   Sun Jun 26 20:41:04 2011 +0200

    Imported Debian patch 1:5.13.0~dfsg-3.1

diff --git a/debian/changelog b/debian/changelog
index 9072385..1474066 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+csound (1:5.13.0~dfsg-3.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * In order to fix FTBFS with GCC, don't append --no-export-all-symbols to
+    SHLINKFLAGS 4.6 (closes: #624982). Thanks to Lucas Nussbaum for the bug
+    report.
+
+ -- Jakub Wilk <jwilk at debian.org>  Sun, 26 Jun 2011 20:41:04 +0200
+
 csound (1:5.13.0~dfsg-3) unstable; urgency=low
 
   * Beats needs bison and flex in order to build (Closes: #613933)
diff --git a/debian/patches/3000-fix-ftbfs-gcc-4.6.diff b/debian/patches/3000-fix-ftbfs-gcc-4.6.diff
new file mode 100644
index 0000000..9cef5ed
--- /dev/null
+++ b/debian/patches/3000-fix-ftbfs-gcc-4.6.diff
@@ -0,0 +1,35 @@
+Description: Fix FTBFS with GCC 4.6.
+ Don't append --no-export-all-symbols to SHLINKFLAGS. This is not a valid
+ compiler flag, and as such is causing FTBFS with GCC 4.6.
+Author: Jakub Wilk <jwilk at debian.org>
+Bug-Debian: http://bugs.debian.org/624982
+Last-Update: 2011-06-26
+
+--- a/SConstruct
++++ b/SConstruct
+@@ -2439,7 +2439,6 @@
+         acEnvironment['LINKFLAGS'].remove(flag)
+     if getPlatform() == 'linux':
+         acEnvironment.Append(LIBS = ['util', 'dl', 'm'])
+-        acEnvironment.Append(SHLINKFLAGS = '--no-export-all-symbols')
+         acEnvironment.Append(LINKFLAGS = ['-Wl,-rpath-link,.'])
+         acEnvironment.Append(LIBS = ['fltk_images'])
+         guiProgramEnvironment.Prepend(LINKFLAGS = ['-Wl,-rpath-link,.'])
+@@ -2571,7 +2570,6 @@
+     vstEnvironment.Append(LIBS = libCsoundLibs)
+     if getPlatform() == 'linux':
+         vstEnvironment.Append(LIBS = ['util', 'dl', 'm'])
+-        vstEnvironment.Append(SHLINKFLAGS = '--no-export-all-symbols')
+         vstEnvironment.Append(LINKFLAGS = ['-Wl,-rpath-link,.'])
+         guiProgramEnvironment.Prepend(LINKFLAGS = ['-Wl,-rpath-link,.'])
+     elif getPlatform() == 'darwin':
+--- a/frontends/SConscript
++++ b/frontends/SConscript
+@@ -392,7 +392,6 @@
+         acEnvironment['SHLINKFLAGS'].remove(flag)
+     if util.platform == 'linux':
+         acEnvironment.Append(LIBS               = ['util', 'dl', 'm'])
+-        acEnvironment.Append(SHLINKFLAGS        = '--no-export-all-symbols')
+         acEnvironment.Append(LINKFLAGS          = ['-Wl,-rpath-link,interfaces'])
+         acEnvironment.Append(LIBS               = ['fltk', 'fltk_images'])
+         try     : os.symlink('lib_CsoundAC.so', '_CsoundAC.so')
diff --git a/debian/patches/series b/debian/patches/series
index 36e126f..34320cb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -14,3 +14,4 @@
 2011-no-link-csoundac-python.diff
 2012-luaCsnd-soname.diff
 2013-no-rawwave-defined.diff
+3000-fix-ftbfs-gcc-4.6.diff

-- 
csound packaging