Import Debian changes 0.5.0+dfsg-1

silx (0.5.0+dfsg-1) unstable; urgency=medium

  * Initial release (Closes: #871637)

1 files changed, 35 insertions, 0 deletions

diff --git a/debian/patches/0003-fix-unit-test.patch b/debian/patches/0003-fix-unit-test.patch
new file mode 100644
index 0000000..4e27e83
--- /dev/null
+++ b/debian/patches/0003-fix-unit-test.patch
@@ -0,0 +1,35 @@
+From: =?utf-8?q?Picca_Fr=C3=A9d=C3=A9ric-Emmanuel?=
+ <picca@synchrotron-soleil.fr>
+Date: Fri, 11 Aug 2017 10:15:26 +0200
+Subject: fix unit test
+
+---
+ silx/opencl/common.py | 13 ++++++++-----
+ 1 file changed, 8 insertions(+), 5 deletions(-)
+
+diff --git a/silx/opencl/common.py b/silx/opencl/common.py
+index fcb4efa..e5f23c0 100644
+--- a/silx/opencl/common.py
++++ b/silx/opencl/common.py
+@@ -59,13 +59,16 @@ else:
+     except ImportError:
+         logger.warning("Unable to import pyOpenCl. Please install it from: http://pypi.python.org/pypi/pyopencl")
+         pyopencl = None
+-        class mf(object):
+-            WRITE_ONLY = 1
+-            READ_ONLY = 1
+-            READ_WRITE = 1
+     else:
+         import pyopencl.array as array
+-        mf = pyopencl.mem_flags
++
++if pyopencl is None:
++    class mf(object):
++        WRITE_ONLY = 1
++        READ_ONLY = 1
++        READ_WRITE = 1
++else:
++    mf = pyopencl.mem_flags
+ 
+ 
+ FLOP_PER_CORE = {"GPU": 64,  # GPU, Fermi at least perform 64 flops per cycle/multicore, G80 were at 24 or 48 ...