[Pkg-octave-commit] [SCM] Debian packaging for octave-java branch, master, updated. 0a1f6ba63d3984dd5f299b51b33e9d0a251a8aa1

[Sébastien Villemot]

The following commit has been merged in the master branch:
commit 198a5597f705f49cf56f22af95ed9c96834291e6
Author: Sébastien Villemot <sebastien.villemot at ens.fr>
Date:   Sun Sep 11 16:25:29 2011 +0200

    Add patch for location of libjvm.so on Debian systems

diff --git a/debian/patches/libjvm.patch b/debian/patches/libjvm.patch
new file mode 100644
index 0000000..cc84729
--- /dev/null
+++ b/debian/patches/libjvm.patch
@@ -0,0 +1,16 @@
+Description: Fix path to libjvm.so
+ This change is specific to the OpenJDK package distributed by Debian.
+Author: Sébastien Villemot <sebastien.villemot at ens.fr>
+Forwarded: not-needed
+Last-Update: 2011-09-06
+--- a/src/__java__.cc
++++ b/src/__java__.cc
+@@ -442,7 +442,7 @@
+ 
+ #else
+ 
+-  std::string jvm_lib_path = JAVA_HOME+std::string("/jre/lib/")+JAVA_ARCH+"/client/libjvm.so";
++  std::string jvm_lib_path = JAVA_HOME+std::string("/jre/lib/")+JAVA_ARCH+"/server/libjvm.so";
+ 
+ #endif
+ 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..53487d2
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+libjvm.patch

-- 
Debian packaging for octave-java