[SCM] csound/master: Refresh patches, drop patch 1000

[fsateler at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 3cb097e792dfbf2a4b2daee976a8ff09b2cd73a3
Author: Felipe Sateler <fsateler at debian.org>
Date:   Thu Jul 11 10:29:17 2013 -0400

    Refresh patches, drop patch 1000

diff --git a/debian/patches/1000-csoundac-cmake-bugfix.patch b/debian/patches/1000-csoundac-cmake-bugfix.patch
deleted file mode 100644
index d063adf..0000000
--- a/debian/patches/1000-csoundac-cmake-bugfix.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/frontends/CsoundAC/CMakeLists.txt
-+++ b/frontends/CsoundAC/CMakeLists.txt
-@@ -33,7 +33,6 @@
- 	allegrowr.cpp
- 	Cell.cpp
- 	ChordLindenmayer.cpp
--	cmake_install.cmake
- 	Composition.cpp
- 	Conversions.cpp
- 	Counterpoint.cpp
diff --git a/debian/patches/2000-avoid-nonfree-scansyn-plugin.diff b/debian/patches/2000-avoid-nonfree-scansyn-plugin.diff
index d4d42bc..925eee5 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/Opcodes/CMakeLists.txt
 +++ b/Opcodes/CMakeLists.txt
-@@ -58,10 +58,6 @@
+@@ -64,10 +64,6 @@
     make_plugin(platerev platerev.c)
  endif()
  
diff --git a/debian/patches/2001-lua-link.diff b/debian/patches/2001-lua-link.diff
index 8fd30c2..80963ed 100644
--- a/debian/patches/2001-lua-link.diff
+++ b/debian/patches/2001-lua-link.diff
@@ -8,7 +8,7 @@ Description: Only link to lua when necessary, and to the correct lib
 Author: Felipe Sateler <fsateler at gmail.com>
 --- a/frontends/CsoundAC/CMakeLists.txt
 +++ b/frontends/CsoundAC/CMakeLists.txt
-@@ -123,10 +123,10 @@
+@@ -128,10 +128,10 @@
              PROPERTIES CPLUSPLUS ON
              SWIG_MODULE_NAME luaCsoundAC)
          SWIG_ADD_MODULE(luaCsoundAC lua luaCsoundAC.i)
@@ -32,3 +32,14 @@ Author: Felipe Sateler <fsateler at gmail.com>
      
          SET_SOURCE_FILES_PROPERTIES(lua_interface.i
              PROPERTIES CPLUSPLUS ON
+--- a/Opcodes/CMakeLists.txt
++++ b/Opcodes/CMakeLists.txt
+@@ -30,7 +30,7 @@
+ find_package(PythonLibs)
+ 
+ #find_library(LUA_LIBRARIES luajit)
+-find_package(Lua52)
++find_package(Lua51)
+ check_include_file(wiiuse.h WIIUSE_H)
+ find_library(WIIUSE_LIB wiiuse)
+ check_include_file(p5glove.h P5GLOVE_H)
diff --git a/debian/patches/2007-apidoc-dotpath.patch b/debian/patches/2007-apidoc-dotpath.patch
index 0fcd5af..e001cc6 100644
--- a/debian/patches/2007-apidoc-dotpath.patch
+++ b/debian/patches/2007-apidoc-dotpath.patch
@@ -2,7 +2,7 @@ Description: Leave dotpath blank in doxygen config
 Author: Felipe Sateler <fsateler at gmail.com>
 --- a/Doxyfile
 +++ b/Doxyfile
-@@ -1512,7 +1512,7 @@
+@@ -1805,7 +1805,7 @@
  # The tag DOT_PATH can be used to specify the path where the dot tool can be 
  # found. If left blank, it is assumed the dot tool can be found in the path.
  
diff --git a/debian/patches/series b/debian/patches/series
index fef61cc..eb4a843 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-1000-csoundac-cmake-bugfix.patch
 2000-avoid-nonfree-scansyn-plugin.diff
 2001-lua-link.diff
 2004-fix-gettext.diff

-- 
csound packaging