[SCM] csound/master: Refresh patches

[fsateler at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit c0383dec449fa118ff0ca07ad6d2506c611660a9
Author: Felipe Sateler <fsateler at debian.org>
Date:   Sat Oct 19 18:12:54 2013 -0300

    Refresh patches

diff --git a/debian/patches/2000-avoid-nonfree-scansyn-plugin.diff b/debian/patches/2000-avoid-nonfree-scansyn-plugin.diff
index 5c98f44..5903606 100644
--- a/debian/patches/2000-avoid-nonfree-scansyn-plugin.diff
+++ b/debian/patches/2000-avoid-nonfree-scansyn-plugin.diff
@@ -6,8 +6,8 @@ Description: Avoid non-free scansyn plugin
 Author: Felipe Sateler <fsateler at gmail.com>
 --- a/Opcodes/CMakeLists.txt
 +++ b/Opcodes/CMakeLists.txt
-@@ -63,10 +63,6 @@
-    make_plugin(platerev platerev.c)
+@@ -69,10 +69,6 @@
+    make_plugin(platerev platerev.c m)
  endif()
  
 -set(scansyn_SRCS
diff --git a/debian/patches/2001-lua-link.diff b/debian/patches/2001-lua-link.diff
index 9a51add..093f7ed 100644
--- a/debian/patches/2001-lua-link.diff
+++ b/debian/patches/2001-lua-link.diff
@@ -8,27 +8,27 @@ 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
-@@ -129,10 +129,10 @@
+@@ -150,10 +150,10 @@
              PROPERTIES CPLUSPLUS ON
              SWIG_MODULE_NAME luaCsoundAC)
          SWIG_ADD_MODULE(luaCsoundAC lua luaCsoundAC.i)
--        SWIG_LINK_LIBRARIES(luaCsoundAC libCsoundAC libcsnd ${CSOUNDLIB} ${FLTK_LIBRARIES} ${LIBSNDFILE_LIBRARY} ${LUA_LIBRARIES})
-+        SWIG_LINK_LIBRARIES(luaCsoundAC libCsoundAC libcsnd ${CSOUNDLIB} ${FLTK_LIBRARIES} ${LIBSNDFILE_LIBRARY})
+-        SWIG_LINK_LIBRARIES(luaCsoundAC libCsoundAC libcsnd6 ${CSOUNDLIB} ${FLTK_LIBRARIES} ${LIBSNDFILE_LIBRARY} ${LUAJIT_LIBRARY})
++        SWIG_LINK_LIBRARIES(luaCsoundAC libCsoundAC libcsnd6 ${CSOUNDLIB} ${FLTK_LIBRARIES} ${LIBSNDFILE_LIBRARY})
  
          if(MUSICXML_LIBRARY)
--            SWIG_LINK_LIBRARIES(luaCsoundAC libCsoundAC libcsnd ${CSOUNDLIB} ${FLTK_LIBRARIES} ${LIBSNDFILE_LIBRARY} ${MUSICXML_LIBRARY} ${LUA_LIBRARIES})
-+            SWIG_LINK_LIBRARIES(luaCsoundAC libCsoundAC libcsnd ${CSOUNDLIB} ${FLTK_LIBRARIES} ${LIBSNDFILE_LIBRARY} ${MUSICXML_LIBRARY})
+-          SWIG_LINK_LIBRARIES(luaCsoundAC libCsoundAC libcsnd6 ${CSOUNDLIB} ${FLTK_LIBRARIES} ${LIBSNDFILE_LIBRARY} ${MUSICXML_LIBRARY} ${LUAJIT_LIBRARY})
++          SWIG_LINK_LIBRARIES(luaCsoundAC libCsoundAC libcsnd6 ${CSOUNDLIB} ${FLTK_LIBRARIES} ${LIBSNDFILE_LIBRARY} ${MUSICXML_LIBRARY})
          endif()
  
-         set_target_properties(${SWIG_MODULE_luaCsoundAC_REAL_NAME} PROPERTIES
+ 
 --- a/interfaces/CMakeLists.txt
 +++ b/interfaces/CMakeLists.txt
-@@ -142,7 +142,7 @@
+@@ -147,7 +147,7 @@
+     endif()
+ 
      if(BUILD_LUA_INTERFACE)
-         INCLUDE_DIRECTORIES(${LUA_INCLUDE_DIR})
+-        set(swiglua_LIBS ${LUAJIT_LIBRARY} ${CSOUNDLIB} libcsnd6)
++        set(swiglua_LIBS ${CSOUNDLIB} libcsnd6)
  
--        set(swiglua_LIBS ${LUA_LIBRARIES} ${CSOUNDLIB} libcsnd)
-+        set(swiglua_LIBS ${CSOUNDLIB} libcsnd)
-     
          SET_SOURCE_FILES_PROPERTIES(lua_interface.i
              PROPERTIES CPLUSPLUS ON
diff --git a/debian/patches/2004-fix-gettext.diff b/debian/patches/2004-fix-gettext.diff
index dbce4dc..4e70f9c 100644
--- a/debian/patches/2004-fix-gettext.diff
+++ b/debian/patches/2004-fix-gettext.diff
@@ -2,7 +2,7 @@ Description: Set the correct path to search for locales
 Author: Felipe Sateler <fsateler at gmail.com>
 --- a/Top/getstring.c
 +++ b/Top/getstring.c
-@@ -74,10 +74,7 @@
+@@ -77,10 +77,7 @@
  /*       setlocale (LC_MESSAGES, s);    /\* Set to particular value *\/ */
  /*    textdomain("csound6"); */  /* This is not needed when using dgettext */
      /* bind_textdomain_codeset("csound6", "UTF-8"); */

-- 
csound packaging