[SCM] csound/master: Backport fix from upstream to build the java interface

[fsateler at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 6d64d53d2982e63038023066aad6cb9f5190ca23
Author: Felipe Sateler <fsateler at debian.org>
Date:   Fri Sep 28 18:34:44 2012 -0300

    Backport fix from upstream to build the java interface

diff --git a/debian/patches/0004-swig-java-package.patch b/debian/patches/0004-swig-java-package.patch
new file mode 100644
index 0000000..d98dbb9
--- /dev/null
+++ b/debian/patches/0004-swig-java-package.patch
@@ -0,0 +1,14 @@
+Correctly pass the -package flag to the java interface build
+--- a/interfaces/CMakeLists.txt
++++ b/interfaces/CMakeLists.txt
+@@ -97,8 +97,9 @@
+         INCLUDE_DIRECTORIES(${JNI_INCLUDE_DIRS})
+         set(swigjava_LIBS ${JNI_LIBRARIES} ${CSOUNDLIB} ${LIBSNDFILE_LIBRARY} libcsnd)
+ 
++        list(APPEND javaSwigOptions -package csnd)
+         SET_SOURCE_FILES_PROPERTIES(java_interface.i PROPERTIES CPLUSPLUS ON)
+-        SET_SOURCE_FILES_PROPERTIES(java_interface.i SWIG_FLAGS "-package" "csnd")
++        SET_SOURCE_FILES_PROPERTIES(java_interface.i PROPERTIES SWIG_FLAGS "${javaSwigOptions}")
+         SWIG_ADD_MODULE(_jcsound java java_interface.i)
+         SWIG_LINK_LIBRARIES(_jcsound ${swigjava_LIBS})
+ 
diff --git a/debian/patches/series b/debian/patches/series
index a471e18..1b6fda0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,6 @@
 0000-backported-cmake-additions.diff
 0003-csoundac.patch
+0004-swig-java-package.patch
 1000-csoundac-cmake-bugfix.patch
 2000-avoid-nonfree-scansyn-plugin.diff
 2001-lua-link.diff

-- 
csound packaging