[SCM] csound/master: Unfuzz patches.

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit bb1e0e594ff3cb470f9915690a247a05c5f6b4cd
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Thu Jan 19 19:12:14 2012 +0100

    Unfuzz patches.

diff --git a/debian/patches/1000-use-system-stk.diff b/debian/patches/1000-use-system-stk.diff
index 0847d2a..6b0b67a 100644
--- a/debian/patches/1000-use-system-stk.diff
+++ b/debian/patches/1000-use-system-stk.diff
@@ -14,7 +14,7 @@ Forwarded: no
  stkFound = configure.CheckHeader("Opcodes/stk/include/Stk.h", language = "C++")
  pdhfound = configure.CheckHeader("m_pd.h", language = "C")
  tclhfound = configure.CheckHeader("tcl.h", language = "C")
-@@ -2071,7 +2072,7 @@
+@@ -2072,7 +2073,7 @@
  
  # STK opcodes
  
@@ -23,7 +23,7 @@ Forwarded: no
      print 'CONFIGURATION DECISION: Not building STK opcodes.'
  else:
      print 'CONFIGURATION DECISION: Building STK opcodes.'
-@@ -2082,53 +2083,47 @@
+@@ -2083,53 +2084,47 @@
      #   csound5/Opcodes/stk/rawwaves
      # Then, the following sources (and any other future I/O or OS dependent
      # sources) should be ignored:
diff --git a/debian/patches/1003-abi-plugin-dir.diff b/debian/patches/1003-abi-plugin-dir.diff
index b457fbf..3ac5bc3 100644
--- a/debian/patches/1003-abi-plugin-dir.diff
+++ b/debian/patches/1003-abi-plugin-dir.diff
@@ -12,7 +12,7 @@ Author: Felipe Sateler <fsateler at gmail.com>
          s = '-DCS_DEFAULT_PLUGINDIR=\\"%s\\"' % tmp
          csoundLibraryEnvironment.Append(CPPFLAGS = [s])
      elif buildOSXFramework != 0:
-@@ -2870,6 +2871,8 @@
+@@ -2871,6 +2872,8 @@
      PLUGIN_DIR = LIB_DIR + "/csound/plugins"
  else:
      PLUGIN_DIR = LIB_DIR + "/csound/plugins64"
diff --git a/debian/patches/1005-fix-ftbfs-gcc-4.6.diff b/debian/patches/1005-fix-ftbfs-gcc-4.6.diff
index 0f9e199..15e068c 100644
--- a/debian/patches/1005-fix-ftbfs-gcc-4.6.diff
+++ b/debian/patches/1005-fix-ftbfs-gcc-4.6.diff
@@ -7,7 +7,7 @@ Last-Update: 2011-06-26
 
 --- a/SConstruct
 +++ b/SConstruct
-@@ -2423,7 +2423,6 @@
+@@ -2419,7 +2419,6 @@
          acEnvironment['LINKFLAGS'].remove(flag)
      if getPlatform() == 'linux':
          acEnvironment.Append(LIBS = ['util', 'dl', 'm'])
@@ -15,7 +15,7 @@ Last-Update: 2011-06-26
          acEnvironment.Append(LINKFLAGS = ['-Wl,-rpath-link,.'])
          acEnvironment.Append(LIBS = ['fltk_images'])
          guiProgramEnvironment.Prepend(LINKFLAGS = ['-Wl,-rpath-link,.'])
-@@ -2549,7 +2548,6 @@
+@@ -2545,7 +2544,6 @@
      vstEnvironment.Append(LIBS = libCsoundLibs)
      if getPlatform() == 'linux':
          vstEnvironment.Append(LIBS = ['util', 'dl', 'm'])
diff --git a/debian/patches/2000-avoid-nonfree-scansyn-plugin.diff b/debian/patches/2000-avoid-nonfree-scansyn-plugin.diff
index 3458cc3..42b3c8e 100644
--- a/debian/patches/2000-avoid-nonfree-scansyn-plugin.diff
+++ b/debian/patches/2000-avoid-nonfree-scansyn-plugin.diff
@@ -6,7 +6,7 @@ Description: Avoid non-free scansyn plugin
 Author: Felipe Sateler <fsateler at gmail.com>
 --- a/SConstruct
 +++ b/SConstruct
-@@ -1678,9 +1678,6 @@
+@@ -1679,9 +1679,6 @@
      makePlugin(pluginEnvironment, 'urandom', ['Opcodes/urandom.c'])
  
  
diff --git a/debian/patches/2001-lua-link.diff b/debian/patches/2001-lua-link.diff
index aa0ab9a..3a5063c 100644
--- a/debian/patches/2001-lua-link.diff
+++ b/debian/patches/2001-lua-link.diff
@@ -16,7 +16,7 @@ Author: Felipe Sateler <fsateler at gmail.com>
         	luaWrapper = makeLuaModule(luaWrapperEnvironment, 'luaCsnd', [csoundLuaInterface])
  	Depends(luaWrapper, csoundLuaInterface)
  
-@@ -2160,7 +2160,7 @@
+@@ -2161,7 +2161,7 @@
      
      if getPlatform() == 'linux':
         if(luaFound == 1):
@@ -25,7 +25,7 @@ Author: Felipe Sateler <fsateler at gmail.com>
           luaEnvironment.Append(LIBS = ['util', 'dl', 'm'])
      elif getPlatform() == 'win32':
         if(luaFound == 1):
-@@ -2519,7 +2519,7 @@
+@@ -2515,7 +2515,7 @@
         	  luaCsoundACWrapperEnvironment.Prepend(LIBS = Split('luaCsnd lua51 CsoundAC csnd fltk_images'))
         else:
         	  luaCsoundACWrapperEnvironment.Prepend(LIBS = [luaWrapper])
diff --git a/debian/patches/2002-csoundac.diff b/debian/patches/2002-csoundac.diff
index 35af01b..9c11fa9 100644
--- a/debian/patches/2002-csoundac.diff
+++ b/debian/patches/2002-csoundac.diff
@@ -2,7 +2,7 @@ Description: Enable support for building CsoundAC as a shared library
 Author: Felipe Sateler <fsateler at gmail.com>
 --- a/SConstruct
 +++ b/SConstruct
-@@ -2423,8 +2423,6 @@
+@@ -2419,8 +2419,6 @@
          acEnvironment.Append(LINKFLAGS = ['-Wl,-rpath-link,.'])
          acEnvironment.Append(LIBS = ['fltk_images'])
          guiProgramEnvironment.Prepend(LINKFLAGS = ['-Wl,-rpath-link,.'])
@@ -11,7 +11,7 @@ Author: Felipe Sateler <fsateler at gmail.com>
      elif getPlatform() == 'darwin':
          acEnvironment.Append(LIBS = ['fltk'])
          acEnvironment.Append(LIBS = ['dl', 'm', 'fltk_images', 'png', 'jpeg'])
-@@ -2479,7 +2477,17 @@
+@@ -2475,7 +2473,17 @@
      acWrapperEnvironment = csoundWrapperEnvironment.Clone()
      fixCFlagsForSwig(acWrapperEnvironment)
      if commonEnvironment['dynamicCsoundLibrary'] == '1':
diff --git a/debian/patches/2011-no-link-csoundac-python.diff b/debian/patches/2011-no-link-csoundac-python.diff
index a482c84..4f8111f 100644
--- a/debian/patches/2011-no-link-csoundac-python.diff
+++ b/debian/patches/2011-no-link-csoundac-python.diff
@@ -2,7 +2,7 @@ Description: Avoid linking with the python library, csoundac doesn't need it.
 Author: Felipe Sateler <fsateler at gmail.com>
 --- a/SConstruct
 +++ b/SConstruct
-@@ -2395,7 +2395,8 @@
+@@ -2396,7 +2396,8 @@
      acEnvironment.Append(LIBPATH = pythonLibraryPath)
      acEnvironment.Append(LINKFLAGS = libCsoundLinkFlags)
      if getPlatform() != 'darwin':
@@ -11,4 +11,4 @@ Author: Felipe Sateler <fsateler at gmail.com>
 +        pass
      if musicXmlFound:
          acEnvironment.Prepend(LIBS = 'musicxml2')
-     if getPlatform() != 'win32':
+     if getPlatform() == 'win32':

-- 
csound packaging