[Python-modules-commits] [python-jpype] 09/18: debian/patches/default_jvm_path: useless removed.

[Takaki Taniguchi]

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

takaki pushed a commit to branch master
in repository python-jpype.

commit 0d19517be97597f0c74e3a7ca21d0fd82c9121af
Author: TANIGUCHI Takaki <takaki at debian.org>
Date:   Thu Jun 29 18:26:21 2017 +0900

    debian/patches/default_jvm_path: useless removed.
---
 debian/patches/default_jvm_path | 51 -----------------------------------------
 debian/patches/series           |  1 -
 2 files changed, 52 deletions(-)

diff --git a/debian/patches/default_jvm_path b/debian/patches/default_jvm_path
deleted file mode 100644
index 4dfbd54..0000000
--- a/debian/patches/default_jvm_path
+++ /dev/null
@@ -1,51 +0,0 @@
-From 2dddd4ccefa97b2a09f7d3dd6580f66ad9c48d09 Mon Sep 17 00:00:00 2001
-From: SVN-Git Migration <python-modules-team at lists.alioth.debian.org>
-Date: Thu, 8 Oct 2015 12:19:01 -0700
-Subject: default_jvm_path
-
-Patch-Name: default_jvm_path
----
- src/python/jpype/_linux.py | 12 +++++-------
- 1 file changed, 5 insertions(+), 7 deletions(-)
-
-diff --git a/src/python/jpype/_linux.py b/src/python/jpype/_linux.py
-index 7e8ab51..cb71f65 100644
---- a/src/python/jpype/_linux.py
-+++ b/src/python/jpype/_linux.py
-@@ -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 @@ _KNOWN_LOCATIONS = [
- ]
- 
- 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 @@ def getDefaultJVMPath() :
-         # 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
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 36f33d7..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-default_jvm_path

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-jpype.git