refresh the patch series

8 files changed, 16 insertions, 127 deletions

diff --git a/debian/changelog b/debian/changelog
index 088c454..ac1ba28 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,10 @@
 silx (0.6.0+dfsg-1) UNRELEASED; urgency=medium
 
   * New upstream version 0.6.0+dfsg
+  * d/patches
+    - 0001-fix-the-build_man-target.patch (deleted)
+    - 0004-test-unactive-ressource-for-now.patch (deleted)
+    - 0005-fix-the-sift-removal.patch (deleted)
 
  -- Picca Frédéric-Emmanuel <picca@debian.org>  Sat, 07 Oct 2017 08:08:56 +0200
 
diff --git a/debian/patches/0001-fix-the-build_man-target.patch b/debian/patches/0001-fix-the-build_man-target.patch
deleted file mode 100644
index 02a1899..0000000
--- a/debian/patches/0001-fix-the-build_man-target.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From: "picca@synchrotron-soleil.fr" <picca@synchrotron-soleil.fr>
-Date: Wed, 2 Aug 2017 15:43:37 +0200
-Subject: fix the build_man target
-
----
- doc/source/conf.py | 6 +-----
- 1 file changed, 1 insertion(+), 5 deletions(-)
-
-diff --git a/doc/source/conf.py b/doc/source/conf.py
-index 30abf54..44f0a3e 100644
---- a/doc/source/conf.py
-+++ b/doc/source/conf.py
-@@ -15,16 +15,12 @@ import sys
- import os
- import glob
- import subprocess
-+import silx
- 
- # If extensions (or modules to document with autodoc) are in another directory,
- # add these directories to sys.path here. If the directory is relative to the
- # documentation root, use os.path.abspath to make it absolute, like shown here.
- # sys.path.insert(0, os.path.abspath('.'))
--dirname = os.path.dirname
--root_dir = dirname(dirname(dirname(os.path.abspath(__file__))))
--import silx
--source_dir = dirname(dirname(silx.__file__))
--os.environ["PYTHONPATH"] = source_dir + os.pathsep + os.environ.get("PYTHONPATH", "")
- 
- # -- General configuration -----------------------------------------------------
- 
diff --git a/debian/patches/0002-use-the-system-mathjax-privacy-breach.patch b/debian/patches/0002-use-the-system-mathjax-privacy-breach.patch
index 81cf440..cb6fb00 100644
--- a/debian/patches/0002-use-the-system-mathjax-privacy-breach.patch
+++ b/debian/patches/0002-use-the-system-mathjax-privacy-breach.patch
@@ -8,10 +8,10 @@ Subject: use the system mathjax (privacy breach)
  1 file changed, 5 insertions(+)
 
 diff --git a/doc/source/conf.py b/doc/source/conf.py
-index 44f0a3e..375c2bf 100644
+index e724d3c..d01cd39 100644
 --- a/doc/source/conf.py
 +++ b/doc/source/conf.py
-@@ -100,6 +100,11 @@ pygments_style = 'sphinx'
+@@ -133,6 +133,11 @@ pygments_style = 'sphinx'
  # A list of ignored prefixes for module index sorting.
  # modindex_common_prefix = []
  
diff --git a/debian/patches/0003-fix-unit-test.patch b/debian/patches/0003-fix-unit-test.patch
index 4e27e83..e441748 100644
--- a/debian/patches/0003-fix-unit-test.patch
+++ b/debian/patches/0003-fix-unit-test.patch
@@ -4,21 +4,15 @@ 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(-)
+ silx/opencl/common.py | 9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
 
 diff --git a/silx/opencl/common.py b/silx/opencl/common.py
-index fcb4efa..e5f23c0 100644
+index ebf50c7..5661530 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")
+@@ -61,7 +61,14 @@ else:
          pyopencl = None
--        class mf(object):
--            WRITE_ONLY = 1
--            READ_ONLY = 1
--            READ_WRITE = 1
      else:
          import pyopencl.array as array
 -        mf = pyopencl.mem_flags
@@ -31,5 +25,5 @@ index fcb4efa..e5f23c0 100644
 +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 ...
+ if pyopencl is None:
+     # Define default mem flags
diff --git a/debian/patches/0004-test-unactive-ressource-for-now.patch b/debian/patches/0004-test-unactive-ressource-for-now.patch
deleted file mode 100644
index d609678..0000000
--- a/debian/patches/0004-test-unactive-ressource-for-now.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: =?utf-8?q?Picca_Fr=C3=A9d=C3=A9ric-Emmanuel?=
- <picca@synchrotron-soleil.fr>
-Date: Fri, 11 Aug 2017 10:57:17 +0200
-Subject: test unactive ressource for now
-
----
- silx/test/__init__.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/silx/test/__init__.py b/silx/test/__init__.py
-index 01ee8d1..ddbc5c1 100644
---- a/silx/test/__init__.py
-+++ b/silx/test/__init__.py
-@@ -60,7 +60,7 @@ def suite():
-     # then test no-gui tests
-     test_suite.addTest(test_utils.suite())
-     test_suite.addTest(test_version.suite())
--    test_suite.addTest(test_resources.suite())
-+    # test_suite.addTest(test_resources.suite())
-     test_suite.addTest(test_utils.suite())
-     test_suite.addTest(test_io.suite())
-     test_suite.addTest(test_math.suite())
diff --git a/debian/patches/0005-fix-the-sift-removal.patch b/debian/patches/0005-fix-the-sift-removal.patch
deleted file mode 100644
index 2c85d15..0000000
--- a/debian/patches/0005-fix-the-sift-removal.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From: =?utf-8?q?Picca_Fr=C3=83=C2=A9d=C3=83=C2=A9ric-Emmanuel?=
- <picca@synchrotron-soleil.fr>
-Date: Fri, 11 Aug 2017 16:02:12 +0200
-Subject: fix the sift removal
-
----
- silx/opencl/setup.py         | 5 ++++-
- silx/opencl/test/__init__.py | 7 +++++--
- 2 files changed, 9 insertions(+), 3 deletions(-)
-
-diff --git a/silx/opencl/setup.py b/silx/opencl/setup.py
-index d0181cd..bc23c2b 100644
---- a/silx/opencl/setup.py
-+++ b/silx/opencl/setup.py
-@@ -29,12 +29,15 @@ __copyright__ = "European Synchrotron Radiation Facility, Grenoble, France"
- __authors__ = ["J. Kieffer"]
- __date__ = "08/09/2016"
- 
-+import os
-+
- from numpy.distutils.misc_util import Configuration
- 
- 
- def configuration(parent_package='', top_path=None):
-     config = Configuration('opencl', parent_package, top_path)
--    config.add_subpackage('sift')
-+    if os.path.exists('sift'):
-+        config.add_subpackage('sift')
-     config.add_subpackage('test')
-     return config
- 
-diff --git a/silx/opencl/test/__init__.py b/silx/opencl/test/__init__.py
-index 24aa06e..bdc83a9 100644
---- a/silx/opencl/test/__init__.py
-+++ b/silx/opencl/test/__init__.py
-@@ -29,13 +29,16 @@ __date__ = "15/03/2017"
- import unittest
- from . import test_addition
- from . import test_medfilt
--from ..sift import test as test_sift
- 
- 
- def suite():
-     test_suite = unittest.TestSuite()
-     test_suite.addTests(test_addition.suite())
-     test_suite.addTests(test_medfilt.suite())
--    test_suite.addTests(test_sift.suite())
-+    try:
-+        from ..sift import test as test_sift
-+        test_suite.addTests(test_sift.suite())
-+    except ImportError:
-+        pass
- 
-     return test_suite
diff --git a/debian/patches/0007-add-install_requires-dependencies.patch b/debian/patches/0007-add-install_requires-dependencies.patch
index 467d8c1..0e56bd9 100644
--- a/debian/patches/0007-add-install_requires-dependencies.patch
+++ b/debian/patches/0007-add-install_requires-dependencies.patch
@@ -4,14 +4,14 @@ Date: Thu, 17 Aug 2017 09:30:39 +0200
 Subject: add install_requires dependencies
 
 ---
- setup.py | 20 +++++++++++++++++++-
- 1 file changed, 19 insertions(+), 1 deletion(-)
+ setup.py | 18 +++++++++++++++++-
+ 1 file changed, 17 insertions(+), 1 deletion(-)
 
 diff --git a/setup.py b/setup.py
-index 852c48d..f91cc03 100644
+index 7593cf5..3d2cd39 100644
 --- a/setup.py
 +++ b/setup.py
-@@ -649,7 +649,23 @@ def get_project_configuration(dry_run):
+@@ -704,7 +704,23 @@ def get_project_configuration(dry_run):
          # for most of the computation
          "numpy",
          # for the script launcher
diff --git a/debian/patches/series b/debian/patches/series
index 406220d..b1878a6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,4 @@
-0001-fix-the-build_man-target.patch
 0002-use-the-system-mathjax-privacy-breach.patch
 0003-fix-unit-test.patch
-0004-test-unactive-ressource-for-now.patch
-0005-fix-the-sift-removal.patch
 0006-prefer-pyqt5-over-pyside.patch
 0007-add-install_requires-dependencies.patch