[SCM] csound/master: Remove applied patches, refresh the others

[fsateler at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit ba9ef26d3826c9021413abf45eb5427d54b980a5
Author: Felipe Sateler <fsateler at debian.org>
Date:   Wed Jan 22 01:17:01 2014 -0300

    Remove applied patches, refresh the others

diff --git a/debian/patches/0000-fix-openmp-option.diff b/debian/patches/0000-fix-openmp-option.diff
deleted file mode 100644
index 6c9e33b..0000000
--- a/debian/patches/0000-fix-openmp-option.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Opcodes/CMakeLists.txt b/Opcodes/CMakeLists.txt
-index 7b07ee2..216c37a 100644
---- a/Opcodes/CMakeLists.txt
-+++ b/Opcodes/CMakeLists.txt
-@@ -96,7 +96,7 @@ if(BUILD_DSSI_OPCODES)
-     make_plugin(dssi4cs "${dssi_SRC}" dl)
- endif()
- 
--check_deps(BUILD_FLUID_OPCODES FLUIDSYNTH_H FLUIDSYNTH_LIBRARY USE_OPENMP)
-+check_deps(BUILD_FLUID_OPCODES FLUIDSYNTH_H FLUIDSYNTH_LIBRARY USE_OPEN_MP)
- if(BUILD_FLUID_OPCODES)
-     if(EXISTS ${FLUIDSYNTH_INCLUDE_DIR})
-         include_directories("${FLUIDSYNTH_INCLUDE_DIR}")
diff --git a/debian/patches/0001-removed-linking-to-JNI-Libraries-on-Linux-as-they-ar.patch b/debian/patches/0001-removed-linking-to-JNI-Libraries-on-Linux-as-they-ar.patch
deleted file mode 100644
index 2cab4ec..0000000
--- a/debian/patches/0001-removed-linking-to-JNI-Libraries-on-Linux-as-they-ar.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 914263532ef61c46854fe6ba4ba56730aa39a500 Mon Sep 17 00:00:00 2001
-From: Steven Yi <stevenyi at gmail.com>
-Date: Sun, 20 Oct 2013 15:23:54 -0400
-Subject: [PATCH] removed linking to JNI Libraries on Linux as they are not
- necessary and caused problems; need to review if we can remove on all
- platforms
-
----
- interfaces/CMakeLists.txt | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/interfaces/CMakeLists.txt b/interfaces/CMakeLists.txt
-index 1883832..029a193 100644
---- a/interfaces/CMakeLists.txt
-+++ b/interfaces/CMakeLists.txt
-@@ -113,7 +113,12 @@ if(BUILD_PYTHON_INTERFACE OR BUILD_JAVA_INTERFACE OR BUILD_LUA_INTERFACE)
-         # The java package needs this unset or it will litter us with .java files
-         unset(CMAKE_SWIG_OUTDIR)
-         INCLUDE_DIRECTORIES(${JNI_INCLUDE_DIRS})
--        set(swigjava_LIBS ${JNI_LIBRARIES} ${CSOUNDLIB} ${LIBSNDFILE_LIBRARY} libcsnd6)
-+
-+	if(LINUX)
-+            set(swigjava_LIBS ${CSOUNDLIB} ${LIBSNDFILE_LIBRARY} libcsnd6)
-+        else()
-+            set(swigjava_LIBS ${JNI_LIBRARIES} ${CSOUNDLIB} ${LIBSNDFILE_LIBRARY} libcsnd6)
-+        endif()
- 
-         list(APPEND javaSwigOptions -package csnd6 -includeall)
-         SET_SOURCE_FILES_PROPERTIES(java_interface.i PROPERTIES CPLUSPLUS ON)
--- 
-1.8.4.rc3
-
diff --git a/debian/patches/2000-avoid-nonfree-scansyn-plugin.diff b/debian/patches/2000-avoid-nonfree-scansyn-plugin.diff
index 5903606..a4803f6 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
-@@ -69,10 +69,6 @@
+@@ -70,10 +70,6 @@ if(BUILD_PLATEREV_OPCODES)
     make_plugin(platerev platerev.c m)
  endif()
  
diff --git a/debian/patches/2001-lua-link.diff b/debian/patches/2001-lua-link.diff
index c3a8c58..01ae5d9 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
-@@ -150,10 +150,10 @@
+@@ -145,10 +145,10 @@ if(BUILD_CSOUND_AC)
              PROPERTIES CPLUSPLUS ON
              SWIG_MODULE_NAME luaCsoundAC)
          SWIG_ADD_MODULE(luaCsoundAC lua luaCsoundAC.i)
@@ -23,7 +23,7 @@ Author: Felipe Sateler <fsateler at gmail.com>
  
 --- a/interfaces/CMakeLists.txt
 +++ b/interfaces/CMakeLists.txt
-@@ -152,7 +152,7 @@
+@@ -157,7 +157,7 @@ if(BUILD_PYTHON_INTERFACE OR BUILD_JAVA_
      endif()
  
      if(BUILD_LUA_INTERFACE)
diff --git a/debian/patches/2004-fix-gettext.diff b/debian/patches/2004-fix-gettext.diff
index 4e70f9c..d3c3a8c 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
-@@ -77,10 +77,7 @@
+@@ -77,10 +77,7 @@ void init_getstring(void *cs)
  /*       setlocale (LC_MESSAGES, s);    /\* Set to particular value *\/ */
  /*    textdomain("csound6"); */  /* This is not needed when using dgettext */
      /* bind_textdomain_codeset("csound6", "UTF-8"); */
diff --git a/debian/patches/series b/debian/patches/series
index 44be967..48cbb42 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,3 @@
-0000-fix-openmp-option.diff
-0001-removed-linking-to-JNI-Libraries-on-Linux-as-they-ar.patch
 2000-avoid-nonfree-scansyn-plugin.diff
 2001-lua-link.diff
 2004-fix-gettext.diff

-- 
csound packaging