[jpy] 04/09: Enable more archs

[Alastair McKinstry]

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

mckinstry pushed a commit to tag debian/0.8-6
in repository jpy.

commit 4f38082fa2fb70fd08b86d707e84bdbc55d3cc42
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Mon Sep 5 18:55:42 2016 +0100

    Enable more archs
---
 debian/changelog           |  5 ++++-
 debian/compat              |  2 +-
 debian/patches/archs.patch | 20 ++++++++++++++++++++
 debian/patches/arm64.patch | 18 ++++++++++++++++++
 debian/patches/series      |  1 +
 5 files changed, 44 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index fcb1947..d4fdba3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,7 +7,10 @@ jpy (0.8-5) unstable; urgency=medium
   [ Chris Lamb ]
   * Patch for bit-reproduciblity. Closes: #834897.
 
- -- Alastair McKinstry <mckinstry at debian.org>  Tue, 30 Aug 2016 05:31:13 +0100
+  [Alastair McKinstry]
+  * Enable powerpc, arm64, sparc64 archs.
+
+ -- Alastair McKinstry <mckinstry at debian.org>  Mon, 05 Sep 2016 18:55:30 +0100
 
 jpy (0.8-4) unstable; urgency=medium
 
diff --git a/debian/compat b/debian/compat
index ec63514..f599e28 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/patches/archs.patch b/debian/patches/archs.patch
new file mode 100644
index 0000000..2c3936d
--- /dev/null
+++ b/debian/patches/archs.patch
@@ -0,0 +1,20 @@
+Author: Alastair McKinstry <mckinstry at debian.org>
+Description: Handle powerpc, sparc64 archs
+Last-Updated: 2016-09-05
+Forwarded: no
+
+Index: jpy-0.8/jpyutil.py
+===================================================================
+--- jpy-0.8.orig/jpyutil.py
++++ jpy-0.8/jpyutil.py
+@@ -165,6 +165,10 @@ def _get_jvm_lib_dirs(java_home_dir):
+         arch = 'ppc64le'
+     if arch == 'arm64':
+         arch = 'aarch64'
++    if arch == 'powerpc':
++        arch = 'ppc'
++    if arch == 'sparc64':
++        arch = 'sparcv9'
+     return (os.path.join(java_home_dir, 'bin'),
+             os.path.join(java_home_dir, 'bin', 'server'),
+             os.path.join(java_home_dir, 'bin', 'client'),
diff --git a/debian/patches/arm64.patch b/debian/patches/arm64.patch
new file mode 100644
index 0000000..3734d9f
--- /dev/null
+++ b/debian/patches/arm64.patch
@@ -0,0 +1,18 @@
+Author: Alastair McKinstry <mckinstry at debian.org>
+Description: Fix for arm64 on Debian
+Last-Updated: 2016-09-05
+Forwarded: no
+
+Index: jpy-0.8/jpyutil.py
+===================================================================
+--- jpy-0.8.orig/jpyutil.py
++++ jpy-0.8/jpyutil.py
+@@ -163,6 +163,8 @@ def _get_jvm_lib_dirs(java_home_dir):
+     arch = arch.decode('utf-8') if type(arch) != str
+     if arch == 'ppc64el':
+         arch = 'ppc64le'
++    if arch == 'arm64':
++        arch = 'aarch64'
+     return (os.path.join(java_home_dir, 'bin'),
+             os.path.join(java_home_dir, 'bin', 'server'),
+             os.path.join(java_home_dir, 'bin', 'client'),
diff --git a/debian/patches/series b/debian/patches/series
index 2079c2c..96c8743 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ default_jvm.patch
 python3.patch
 reproducible.patch
 ppc64el.patch
+arm64.patch

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