[jpy] 03/09: OpenJDK is currently using notation 'ppc64le'. Closes: #833174 * Patch for bit-reproduciblity. Closes: #834897.

[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 25567103184f591e8f46d65a0a128fe357f67377
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Tue Aug 30 05:31:27 2016 +0100

    OpenJDK is currently using notation 'ppc64le'. Closes: #833174
    * Patch for bit-reproduciblity. Closes: #834897.
---
 debian/changelog             | 11 +++++++----
 debian/patches/ppc64el.patch | 22 ++++++++++++----------
 debian/rules                 |  4 +++-
 3 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 95094c8..fcb1947 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,13 @@
-jpy (0.8-4.1) UNRELEASED; urgency=medium
+jpy (0.8-5) unstable; urgency=medium
 
-  * Non-maintainer upload.
+  [ Fernando Seiti Furusato ]
   * debian/patches/ppc64el.patch: fixing ppc64el arch dir to fix FTBFS.
-    OpenJDK is currently using notation 'ppc64le'.
+    OpenJDK is currently using notation 'ppc64le'. Closes: #833174
 
- -- Fernando Seiti Furusato <ferseiti at br.ibm.com>  Mon, 01 Aug 2016 13:48:50 -0400
+  [ Chris Lamb ]
+  * Patch for bit-reproduciblity. Closes: #834897.
+
+ -- Alastair McKinstry <mckinstry at debian.org>  Tue, 30 Aug 2016 05:31:13 +0100
 
 jpy (0.8-4) unstable; urgency=medium
 
diff --git a/debian/patches/ppc64el.patch b/debian/patches/ppc64el.patch
index 84611ea..1ea5ba2 100644
--- a/debian/patches/ppc64el.patch
+++ b/debian/patches/ppc64el.patch
@@ -4,21 +4,23 @@ Description: support for ppc64el  architecture
 Last-Updated: 2016-08-30
 Forwarded: no
 
---- a/jpyutil.py
-+++ b/jpyutil.py
-@@ -161,6 +161,8 @@
-     arch = check_output(['dpkg-architecture','-q', 'DEB_BUILD_ARCH_CPU']).strip()
-     if type(arch) != str: # python3
-         arch = arch.decode('utf-8')
+Index: jpy-0.8/jpyutil.py
+===================================================================
+--- jpy-0.8.orig/jpyutil.py
++++ jpy-0.8/jpyutil.py
+@@ -161,6 +161,8 @@ def _get_jvm_lib_dirs(java_home_dir):
+     # arch = 'amd64' if PYTHON_64BIT else 'i386'
+     arch = subprocess.check_output(['dpkg-architecture','-q', 'DEB_BUILD_ARCH_CPU']).strip()
+     arch = arch.decode('utf-8') if type(arch) != str
 +    if arch == 'ppc64el':
 +        arch = 'ppc64le'
      return (os.path.join(java_home_dir, 'bin'),
              os.path.join(java_home_dir, 'bin', 'server'),
              os.path.join(java_home_dir, 'bin', 'client'),
-@@ -200,6 +202,8 @@
-     arch = check_output(['dpkg-architecture','-q', 'DEB_BUILD_ARCH_CPU']).strip()
-     if type(arch) != str: # python3
-         arch = arch.decode('utf-8')
+@@ -199,6 +201,8 @@ def _find_jvm_dll_file(java_home_dir):
+ 
+     arch = subprocess.check_output(['dpkg-architecture','-q', 'DEB_BUILD_ARCH_CPU']).strip()
+     arch = arch.decode('utf-8') if type(arch) != str
 +    if arch == 'ppc64el':
 +        arch = 'ppc64le'
      search_dirs += "/usr/lib/jvm/default-java/jre/lib/%s/server" % arch
diff --git a/debian/rules b/debian/rules
index ac94fe4..89c56f3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 export JAVA_HOME=/usr/lib/jvm/default-java
-# export DH_VERBOSE=1
+export DH_VERBOSE=1
 
 PYVERS:=$(shell pyversions -r)
 PY3VERS:=$(shell py3versions -r)
@@ -25,3 +25,5 @@ override_dh_auto_install:
                 done
 	dh_auto_install
 	find . -name '*.so' -exec chrpath -d {} \;
+	# Strip build path; the libs will exist under /usr, not debian/tmp
+	find . -name 'jpyconfig.properties' -exec sed -i -e 's,$(CURDIR)/debian/tmp,,g' {} \;

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