From 0033c5375289f192c3ab2b429682df914e879655 Mon Sep 17 00:00:00 2001 From: Alexandre Marie Date: Mon, 17 Dec 2018 13:43:26 +0100 Subject: refresh patch series --- ...002-use-the-system-mathjax-privacy-breach.patch | 2 +- ...03-do-not-modify-PYTHONPATH-from-setup.py.patch | 2 +- debian/patches/0003-fix-unit-test.patch | 2 +- .../0007-add-install_requires-dependencies.patch | 39 ---------------------- debian/patches/series | 1 - 5 files changed, 3 insertions(+), 43 deletions(-) delete mode 100644 debian/patches/0007-add-install_requires-dependencies.patch (limited to 'debian') 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 d1fa79d..641d90a 100644 --- a/debian/patches/0002-use-the-system-mathjax-privacy-breach.patch +++ b/debian/patches/0002-use-the-system-mathjax-privacy-breach.patch @@ -8,7 +8,7 @@ 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 234e4fa..ab5e24b 100644 +index 23efd15..532f6bf 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -142,6 +142,11 @@ pygments_style = 'sphinx' 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 9a82a2b..f4bbf44 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 69a6dca..bc7ea27 100644 +index 5ce0435..40b2e8e 100644 --- a/setup.py +++ b/setup.py @@ -257,7 +257,8 @@ class BuildMan(Command): diff --git a/debian/patches/0003-fix-unit-test.patch b/debian/patches/0003-fix-unit-test.patch index ceaebf4..07523e7 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 e955f46..07159e2 100644 +index 9a04035..17c67d1 100644 --- a/silx/opencl/common.py +++ b/silx/opencl/common.py @@ -61,7 +61,14 @@ else: diff --git a/debian/patches/0007-add-install_requires-dependencies.patch b/debian/patches/0007-add-install_requires-dependencies.patch deleted file mode 100644 index 940ac56..0000000 --- a/debian/patches/0007-add-install_requires-dependencies.patch +++ /dev/null @@ -1,39 +0,0 @@ -From: =?utf-8?q?Picca_Fr=C3=A9d=C3=A9ric-Emmanuel?= - -Date: Thu, 17 Aug 2017 09:30:39 +0200 -Subject: add install_requires dependencies - ---- - setup.py | 19 ++++++++++++++++++- - 1 file changed, 18 insertions(+), 1 deletion(-) - -diff --git a/setup.py b/setup.py -index bc7ea27..8c4dd3d 100644 ---- a/setup.py -+++ b/setup.py -@@ -857,7 +857,24 @@ def get_project_configuration(dry_run): - # for most of the computation - "numpy %s" % numpy_requested_version, - # for the script launcher -- "setuptools"] -+ "setuptools", -+ # Debian added -+ 'futures;python_version<"3.2"', -+ "ipython", -+ "qtconsole", -+ 'enum34;python_version<"3.4"', -+ "fabio", -+ "h5py", -+ "lxml", -+ "mako", -+ "matplotlib", -+ "PyOpenGL", -+ "pil", -+ "pyopencl", -+ "PyQt5", -+ "scipy", -+ "six" -+ ] - - setup_requires = ["setuptools", "numpy"] - diff --git a/debian/patches/series b/debian/patches/series index 40de024..168097d 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ 0002-use-the-system-mathjax-privacy-breach.patch 0003-fix-unit-test.patch 0003-do-not-modify-PYTHONPATH-from-setup.py.patch -0007-add-install_requires-dependencies.patch -- cgit v1.2.3