[SCM] csound/master: Merge NMU from Jakub Wilk

[fsateler at users.alioth.debian.org]

Imported Debian patch 1:5.13.0~dfsg-3.1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 11fbc1d5fe21d75af4ec39ed2c79347e0db2960e
X-Git-Newrev: 871f8c90dc0ded3aea3c2c8ddfcac9dce32aba3d

The following commit has been merged in the master branch:
commit d2cf2dbc1006f2fdf0b01282cfd65c23d976cb91
Merge: 219f1a2d75614a9aec3f43fffb8285cf20723f68 e8dd9261b3f78990e4b003f77c265545e2d3b3f5
Author: Felipe Sateler <fsateler at debian.org>
Date:   Wed Jul 6 21:15:07 2011 -0400

    Merge NMU from Jakub Wilk
    
    Move the patch to the correct order in the series file
    
    Conflicts:
    	debian/changelog

diff --combined debian/changelog
index b7af191,1474066..6fab8fc
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,21 -1,12 +1,30 @@@
 +csound (1:5.13.0~dfsg-4) UNRELEASED; urgency=low
 +
 +  [ Alessio Treglia ]
 +  * Switch to dh_python2
 +    - Update fail-missing rule to ignore files installed in /usr/lib/pyshared.
 +  * debian/custom.py: Small fix to set -Wl,--as-needed properly.
 +  * libcsound64-doc provides documentation in HTML format,
 +    fix package description.
 +  * Register documentation with doc-base.
 +
 +  [ Felipe Sateler ]
 +  * Create new package csound-data for common data files.
 +    - Put the HRTF data files there (LP: #225639)
 +  * Drop the dependency on a JRE for libcsnd-java, the policy no longer
 +    requires it.
 +
 + -- Alessio Treglia <alessio at debian.org>  Sun, 10 Apr 2011 18:32:17 -0300
 +
+ 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 --combined debian/patches/1005-fix-ftbfs-gcc-4.6.diff
index 0000000,9cef5ed..9cef5ed
mode 000000,100644..100644
--- a/debian/patches/1005-fix-ftbfs-gcc-4.6.diff
+++ b/debian/patches/1005-fix-ftbfs-gcc-4.6.diff
@@@ -1,0 -1,35 +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 --combined debian/patches/series
index 36e126f,34320cb..b078fe8
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -2,6 -2,6 +2,7 @@@
  1000-use-system-stk.diff
  1003-abi-plugin-dir.diff
  1004-fix-csoundac-csnd-linkage.diff
++1005-fix-ftbfs-gcc-4.6.diff
  2000-avoid-nonfree-scansyn-plugin.diff
  2001-lua-link.diff
  2002-csoundac.diff
@@@ -14,3 -14,4 +15,3 @@@
  2011-no-link-csoundac-python.diff
  2012-luaCsnd-soname.diff
  2013-no-rawwave-defined.diff
 -3000-fix-ftbfs-gcc-4.6.diff

-- 
csound packaging