[h5py] 06/09: cherry-picked 'f4f0a5de Fix arch name for ppc64le' into 'patched'

[Ghislain Vaillant]

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

ghisvail-guest pushed a commit to branch master
in repository h5py.

commit eedffb013535c8fbb3c86b3b90e720e5bcb05a2f
Merge: c552e3c 9607212
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date:   Wed Jan 25 14:08:36 2017 +0000

    cherry-picked 'f4f0a5de Fix arch name for ppc64le' into 'patched'

 debian/.git-dpm                                    |  4 +--
 .../patches/0002-Fix-arch-name-for-ppc64le.patch   | 37 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 h5py/h5t.pyx                                       |  2 +-
 h5py/tests/old/test_h5t.py                         |  2 +-
 5 files changed, 42 insertions(+), 4 deletions(-)

diff --cc debian/.git-dpm
index d215a18,0000000..5c69ce5
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
 +# see git-dpm(1) from git-dpm package
- 0be645c2ca05bc8100b45d0ae40663d064430053
- 0be645c2ca05bc8100b45d0ae40663d064430053
++9607212a1a3999edf25bccddb7ddf52e1c67ece3
++9607212a1a3999edf25bccddb7ddf52e1c67ece3
 +307ed5838b3a194864ed984f312c2f43315f18d4
 +307ed5838b3a194864ed984f312c2f43315f18d4
 +h5py_2.7.0~rc3.orig.tar.gz
 +9098edc50d89b086999c3e7a984a91266aa6a5ee
 +265017
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0002-Fix-arch-name-for-ppc64le.patch
index 0000000,0000000..dc7bdb2
new file mode 100644
--- /dev/null
+++ b/debian/patches/0002-Fix-arch-name-for-ppc64le.patch
@@@ -1,0 -1,0 +1,37 @@@
++From 9607212a1a3999edf25bccddb7ddf52e1c67ece3 Mon Sep 17 00:00:00 2001
++From: Martin Raspaud <martin.raspaud at smhi.se>
++Date: Wed, 25 Jan 2017 09:30:58 +0100
++Subject: Fix arch name for ppc64le
++
++Signed-off-by: Martin Raspaud <martin.raspaud at smhi.se>
++---
++ h5py/h5t.pyx               | 2 +-
++ h5py/tests/old/test_h5t.py | 2 +-
++ 2 files changed, 2 insertions(+), 2 deletions(-)
++
++diff --git a/h5py/h5t.pyx b/h5py/h5t.pyx
++index 8221302..20755e4 100644
++--- a/h5py/h5t.pyx
+++++ b/h5py/h5t.pyx
++@@ -952,7 +952,7 @@ cdef class TypeFloatID(TypeAtomicID):
++     cdef object py_dtype(self):
++         # Translation function for floating-point types
++ 
++-        if MACHINE == 'ppc64el':
+++        if MACHINE == 'ppc64le':
++             size = self.get_size()                  # int giving number of bytes
++             order = _order_map[self.get_order()]    # string with '<' or '>'
++ 
++diff --git a/h5py/tests/old/test_h5t.py b/h5py/tests/old/test_h5t.py
++index f2f3063..08b2503 100644
++--- a/h5py/tests/old/test_h5t.py
+++++ b/h5py/tests/old/test_h5t.py
++@@ -67,7 +67,7 @@ class TestTypeFloatID(TestCase):
++ 
++     def test_custom_float_promotion(self):
++         """Custom floats are correctly promoted to standard floats on read."""
++-        if h5t.MACHINE == 'ppc64el':
+++        if h5t.MACHINE == 'ppc64le':
++             return
++ 
++         test_filename = self.mktemp()
diff --cc debian/patches/series
index 1e2b1cb,0000000..243ee7e
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,0 +1,2 @@@
 +0001-Disable-usage-of-rpath.patch
++0002-Fix-arch-name-for-ppc64le.patch

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