[jpy] 04/13: Remove unused default_jvm.patch

[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 784773944a45917606ded2f4c5090e1510b6805b
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Mon Mar 14 08:46:31 2016 +0000

    Remove unused default_jvm.patch
---
 debian/patches/default_jvm_path  | 41 ----------------------------------------
 debian/patches/no-ez_setup.patch |  5 +++++
 2 files changed, 5 insertions(+), 41 deletions(-)

diff --git a/debian/patches/default_jvm_path b/debian/patches/default_jvm_path
deleted file mode 100644
index 11a2452..0000000
--- a/debian/patches/default_jvm_path
+++ /dev/null
@@ -1,41 +0,0 @@
-Index: python-jpype-0.5.4.2/src/python/jpype/_linux.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
diff --git a/debian/patches/no-ez_setup.patch b/debian/patches/no-ez_setup.patch
index ff4dbca..9c8af7a 100644
--- a/debian/patches/no-ez_setup.patch
+++ b/debian/patches/no-ez_setup.patch
@@ -1,3 +1,8 @@
+Author: Alastair McKinstry <mckinstry at debian.org>
+Description: Don't use ez_setup. Use setuptools instead in Debian
+Last-Updated: 2016-02-17
+Forwarded: not-needed
+
 Index: python-jpy-4.0.0/setup.py
 ===================================================================
 --- python-jpy-4.0.0.orig/setup.py

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