[SCM] csound/master: Refresh patches

[fsateler at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit e9aef96d41592beefe329f1fabba61e36038abd3
Author: Felipe Sateler <fsateler at debian.org>
Date:   Wed Jul 6 21:17:03 2011 -0400

    Refresh patches

diff --git a/debian/patches/1005-fix-ftbfs-gcc-4.6.diff b/debian/patches/1005-fix-ftbfs-gcc-4.6.diff
index 9cef5ed..d608c05 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
-@@ -2439,7 +2439,6 @@
+@@ -2436,7 +2436,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,.'])
-@@ -2571,7 +2570,6 @@
+@@ -2560,7 +2559,6 @@
      vstEnvironment.Append(LIBS = libCsoundLibs)
      if getPlatform() == 'linux':
          vstEnvironment.Append(LIBS = ['util', 'dl', 'm'])
diff --git a/debian/patches/2001-lua-link.diff b/debian/patches/2001-lua-link.diff
index 205102d..eb3a3b8 100644
--- a/debian/patches/2001-lua-link.diff
+++ b/debian/patches/2001-lua-link.diff
@@ -14,7 +14,7 @@ Author: Felipe Sateler <fsateler at gmail.com>
         	luaWrapper = makeLuaModule(luaWrapperEnvironment, 'luaCsnd', [csoundLuaInterface])
  	Depends(luaWrapper, csoundLuaInterface)
  
-@@ -2532,7 +2532,7 @@
+@@ -2531,7 +2531,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 6661d2c..54d8b7d 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
-@@ -2438,8 +2438,6 @@
+@@ -2437,8 +2437,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'])
-@@ -2494,7 +2492,17 @@
+@@ -2493,7 +2491,17 @@
      acWrapperEnvironment = csoundWrapperEnvironment.Clone()
      fixCFlagsForSwig(acWrapperEnvironment)
      if commonEnvironment['dynamicCsoundLibrary'] == '1':

-- 
csound packaging