[jpy] 12/13: Update patches

[Alastair McKinstry]

This is an automated email from the git hooks/post-receive script.

mckinstry pushed a commit to branch master
in repository jpy.

commit 07e13e80ce565176842a5c20a5a5301e4f5b8854
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Mon Apr 11 18:20:45 2016 +0100

    Update patches
---
 debian/patches/default_jvm.patch | 66 ++++++++++++++++------------------------
 debian/patches/series            |  1 +
 2 files changed, 27 insertions(+), 40 deletions(-)

diff --git a/debian/patches/default_jvm.patch b/debian/patches/default_jvm.patch
index 11a2452..75aa7b3 100644
--- a/debian/patches/default_jvm.patch
+++ b/debian/patches/default_jvm.patch
@@ -1,41 +1,27 @@
-Index: python-jpype-0.5.4.2/src/python/jpype/_linux.py
+Author: Alastair McKinstry <mckinstry at debian.org>
+Description: Add libjvm.so to path
+Last-Updated: 2016-04-10
+Forwarded: not-needed
+
+Index: jpy-0.8/jpyutil.py
 ===================================================================
---- python-jpype-0.5.4.2.orig/src/python/jpype/_linux.py	2013-05-15 13:18:27.704339655 +0900
-+++ python-jpype-0.5.4.2/src/python/jpype/_linux.py	2013-05-15 13:23:59.229960405 +0900
-@@ -17,7 +17,8 @@
- 
- import os, re
- 
--
-+import subprocess
-+dpkg_arch = subprocess.check_output(['dpkg', '--print-architecture']).strip()
- 
- _KNOWN_LOCATIONS = [
-     ("/opt/sun/", re.compile(r"j2sdk(.+)/jre/lib/i386/client/libjvm.so") ),
-@@ -26,12 +27,9 @@
- ]
- 
- JRE_ARCHS = [
--			 "amd64/server/libjvm.so",
--			 "i386/client/libjvm.so",
--			 "i386/server/libjvm.so",
-+			 "%s/server/libjvm.so" % dpkg_arch,
- 			 ]
- 
--
- def getDefaultJVMPath() :
-     jvm = _getJVMFromJavaHome()
-     if jvm is not None :
-@@ -47,10 +45,10 @@
-         # TODO
-         pass
- 
--    return "/usr/java/jre1.5.0_05/lib/i386/client/libjvm.so"
-+    return "/usr/lib/jvm/default-java/jre/lib/%s/server/libjvm.so" % dpkg_arch
-         
- def _getJVMFromJavaHome():
--	java_home = os.getenv("JAVA_HOME")
-+	java_home = os.getenv("JAVA_HOME", '')
- 	rootJre = None
- 	if os.path.exists(java_home+"/bin/javac") :
- 		# this is a JDK home
+--- jpy-0.8.orig/jpyutil.py
++++ jpy-0.8/jpyutil.py
+@@ -30,6 +30,7 @@ import ctypes
+ import ctypes.util
+ import logging
+ 
++import subprocess
+ 
+ # Uncomment for debugging
+ # logging.basicConfig(format='%(levelname)s: %(message)s', level=logging.DEBUG)
+@@ -193,6 +194,9 @@ def _find_jvm_dll_file(java_home_dir):
+         search_dirs += _get_jvm_lib_dirs(jre_home_dir)
+     search_dirs += _get_jvm_lib_dirs(java_home_dir)
+ 
++    dpkg_arch = subprocess.check_output(['dpkg', '--print-architecture']).strip()
++    search_dirs += "/usr/lib/jvm/default-java/jre/lib/%s/server" % dpkg_arch
++
+     search_dirs = _add_paths_if_exists([], *search_dirs)
+ 
+     if platform.system() == 'Windows':
diff --git a/debian/patches/series b/debian/patches/series
index c7d138a..1115c9e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 no-ez_setup.patch
 default_jvm.patch
+python3.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/jpy.git