[Python-modules-commits] r24378 - in packages/python-jpype/trunk/debian (2 files)

[takaki at users.alioth.debian.org]

    Date: Wednesday, May 15, 2013 @ 04:05:23
  Author: takaki
Revision: 24378

set default jvm path

Added:
  packages/python-jpype/trunk/debian/patches/default_jvm_path
Modified:
  packages/python-jpype/trunk/debian/changelog

Modified: packages/python-jpype/trunk/debian/changelog
===================================================================
--- packages/python-jpype/trunk/debian/changelog	2013-05-15 02:53:33 UTC (rev 24377)
+++ packages/python-jpype/trunk/debian/changelog	2013-05-15 04:05:23 UTC (rev 24378)
@@ -5,6 +5,7 @@
 
   [ TANIGUCHI Takaki ]
   * Bump Standards Version to 3.9.4 (with no changes). 
+  * debian/patches/default_jvm_path: Set default JVM path. (Closes: #683048)
 
  -- Jakub Wilk <jwilk at debian.org>  Sun, 05 May 2013 16:02:49 +0200
 

Added: packages/python-jpype/trunk/debian/patches/default_jvm_path
===================================================================
--- packages/python-jpype/trunk/debian/patches/default_jvm_path	                        (rev 0)
+++ packages/python-jpype/trunk/debian/patches/default_jvm_path	2013-05-15 04:05:23 UTC (rev 24378)
@@ -0,0 +1,37 @@
+Index: python-jpype-0.5.4.2/src/python/jpype/_linux.py
+===================================================================
+--- python-jpype-0.5.4.2.orig/src/python/jpype/_linux.py	2011-07-27 22:17:06.000000000 +0900
++++ python-jpype-0.5.4.2/src/python/jpype/_linux.py	2013-05-15 12:58:23.162450945 +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,7 +45,7 @@
+         # TODO
+         pass
+ 
+-    return "/usr/java/jre1.5.0_05/lib/i386/client/libjvm.so"
++    return "/usr/lib/jvm/default-jvm/jre/lib/%s/server/libjvm.so" $ arch
+         
+ def _getJVMFromJavaHome():
+ 	java_home = os.getenv("JAVA_HOME")