Removed some patches.

7 files changed, 6 insertions, 100 deletions

diff --git a/debian/changelog b/debian/changelog
index c8fa93b..a8c6c9e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ silx (0.11.0+dfsg-1) UNRELEASED; urgency=medium
 
   * Added test on openCL's use
   * New upstream version 0.11.0+dfsg
+  * d/patches
+    - 0004-fix-missing-import.patches (Removed)
+    - 0005-fix-problem-with-sift-import (Removed)
 
  -- Alexandre Marie <alexandre.marie@synchrotron-soleil.fr>  Tue, 09 Jul 2019 10:23:33 +0200
 
diff --git a/debian/patches/0003-do-not-modify-PYTHONPATH-from-setup.py.patch b/debian/patches/0003-do-not-modify-PYTHONPATH-from-setup.py.patch
index e58e985..4591cb6 100644
--- a/debian/patches/0003-do-not-modify-PYTHONPATH-from-setup.py.patch
+++ b/debian/patches/0003-do-not-modify-PYTHONPATH-from-setup.py.patch
@@ -7,7 +7,7 @@ Subject: do not modify PYTHONPATH from setup.py
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/setup.py b/setup.py
-index b63d0eb..334f7a8 100644
+index 1029bf0..46d0bdf 100644
 --- a/setup.py
 +++ b/setup.py
 @@ -260,7 +260,8 @@ class BuildMan(Command):
diff --git a/debian/patches/0003-fix-unit-test.patch b/debian/patches/0003-fix-unit-test.patch
index 07523e7..4e4f77f 100644
--- a/debian/patches/0003-fix-unit-test.patch
+++ b/debian/patches/0003-fix-unit-test.patch
@@ -8,7 +8,7 @@ Subject: fix unit test
  1 file changed, 8 insertions(+), 1 deletion(-)
 
 diff --git a/silx/opencl/common.py b/silx/opencl/common.py
-index 9a04035..17c67d1 100644
+index 8d31c8a..1f9df50 100644
 --- a/silx/opencl/common.py
 +++ b/silx/opencl/common.py
 @@ -61,7 +61,14 @@ else:
diff --git a/debian/patches/0004-fix-missing-import.patch b/debian/patches/0004-fix-missing-import.patch
deleted file mode 100644
index 4fcd661..0000000
--- a/debian/patches/0004-fix-missing-import.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From: =?utf-8?q?Picca_Fr=C3=A9d=C3=A9ric-Emmanuel?=
- <picca@synchrotron-soleil.fr>
-Date: Tue, 28 May 2019 09:08:57 +0200
-Subject: fix missing import
-
----
- doc/source/ext/snapshotqt_directive.py | 43 +++++++++++++++++-----------------
- 1 file changed, 22 insertions(+), 21 deletions(-)
-
-diff --git a/doc/source/ext/snapshotqt_directive.py b/doc/source/ext/snapshotqt_directive.py
-index 53508df..ee62e3a 100644
---- a/doc/source/ext/snapshotqt_directive.py
-+++ b/doc/source/ext/snapshotqt_directive.py
-@@ -42,6 +42,7 @@ import logging
- import subprocess
- import sys
- import distutils
-+import distutils.util
- import shutil
- from docutils.parsers.rst.directives.images import Image
- from docutils.parsers.rst import directives
-@@ -53,27 +54,27 @@ from docutils import nodes
- # note: conf.py is patching the PATH so this will be the 'current' qt version
- 
- 
--def _distutils_dir_name(dname="lib"):
--    """
--    Returns the name of a distutils build directory
--    """
--    platform = distutils.util.get_platform()
--    architecture = "%s.%s-%i.%i" % (dname, platform,
--                                    sys.version_info[0], sys.version_info[1])
--    return architecture
--
--home = os.path.abspath(os.path.join(__file__, "..", "..", "..", '..'))
--home = os.path.abspath(home)
--LIBPATH = os.path.join(home, 'build', _distutils_dir_name('lib'))
--
--if not os.path.exists(LIBPATH):
--    raise RuntimeError("%s is not on the path. Fix your PYTHONPATH and restart sphinx." % project)
--
--sys.path.append(LIBPATH)
--env = os.environ.copy()
--env.update(
--    {"PYTHONPATH": LIBPATH + os.pathsep + os.environ.get("PYTHONPATH", ""),
--     "PATH": os.environ.get("PATH", "")})
-+# def _distutils_dir_name(dname="lib"):
-+#     """
-+#     Returns the name of a distutils build directory
-+#     """
-+#     platform = distutils.util.get_platform()
-+#     architecture = "%s.%s-%i.%i" % (dname, platform,
-+#                                     sys.version_info[0], sys.version_info[1])
-+#     return architecture
-+
-+# home = os.path.abspath(os.path.join(__file__, "..", "..", "..", '..'))
-+# home = os.path.abspath(home)
-+# LIBPATH = os.path.join(home, 'build', _distutils_dir_name('lib'))
-+
-+# if not os.path.exists(LIBPATH):
-+#     raise RuntimeError("%s is not on the path. Fix your PYTHONPATH and restart sphinx." % project)
-+
-+# sys.path.append(LIBPATH)
-+# env = os.environ.copy()
-+# env.update(
-+#     {"PYTHONPATH": LIBPATH + os.pathsep + os.environ.get("PYTHONPATH", ""),
-+#      "PATH": os.environ.get("PATH", "")})
- 
- 
- if not os.environ.get('DIRECTIVE_SNAPSHOT_QT') == 'True':
diff --git a/debian/patches/0005-fix-problem-with-sift-import.patch b/debian/patches/0005-fix-problem-with-sift-import.patch
deleted file mode 100644
index ac0448a..0000000
--- a/debian/patches/0005-fix-problem-with-sift-import.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From: =?utf-8?q?Picca_Fr=C3=A9d=C3=A9ric-Emmanuel?=
- <picca@synchrotron-soleil.fr>
-Date: Tue, 28 May 2019 11:16:24 +0200
-Subject: fix problem with sift import
-
----
- silx/gui/plot/CompareImages.py | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/silx/gui/plot/CompareImages.py b/silx/gui/plot/CompareImages.py
-index f7c4899..8a26234 100644
---- a/silx/gui/plot/CompareImages.py
-+++ b/silx/gui/plot/CompareImages.py
-@@ -48,7 +48,10 @@ _logger = logging.getLogger(__name__)
- 
- from silx.opencl import ocl
- if ocl is not None:
--    from silx.opencl import sift
-+    try:
-+        from silx.opencl import sift
-+    except ImportError:
-+        sift = None
- else:  # No OpenCL device or no pyopencl
-     sift = None
- 
diff --git a/debian/patches/0006-Tests-if-openCL-can-be-used.patch b/debian/patches/0006-Tests-if-openCL-can-be-used.patch
index 69ba42f..52a8c93 100644
--- a/debian/patches/0006-Tests-if-openCL-can-be-used.patch
+++ b/debian/patches/0006-Tests-if-openCL-can-be-used.patch
@@ -7,7 +7,7 @@ Subject: Tests if openCL can be used
  1 file changed, 8 insertions(+), 1 deletion(-)
 
 diff --git a/silx/opencl/common.py b/silx/opencl/common.py
-index 17c67d1..421a35a 100644
+index 1f9df50..73cf676 100644
 --- a/silx/opencl/common.py
 +++ b/silx/opencl/common.py
 @@ -60,7 +60,14 @@ else:
diff --git a/debian/patches/series b/debian/patches/series
index 64e7e06..1b65e43 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,4 @@
 0002-use-the-system-mathjax-privacy-breach.patch
 0003-fix-unit-test.patch
 0003-do-not-modify-PYTHONPATH-from-setup.py.patch
-0004-fix-missing-import.patch
-0005-fix-problem-with-sift-import.patch
 0006-Tests-if-openCL-can-be-used.patch