New upstream version 0.12.0~b0+dfsg

21 files changed, 488 insertions, 216 deletions

diff --git a/package/debian10/changelog b/package/debian10/changelog
new file mode 100644
index 0000000..3b5427f
--- /dev/null
+++ b/package/debian10/changelog
@@ -0,0 +1,141 @@
+silx (0.11.0+dfsg-1) unstable; urgency=medium
+
+  [ Alexandre Marie ]
+  * 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)
+
+ -- Picca Frédéric-Emmanuel <picca@debian.org>  Tue, 09 Jul 2019 15:26:55 +0200
+
+silx (0.10.1+dfsg-1~exp2) experimental; urgency=medium
+
+  * d/patchs
+    + 0005-fix-problem-with-sift-import.patch (Added)
+
+ -- Picca Frédéric-Emmanuel <picca@synchrotron-soleil.fr>  Tue, 28 May 2019 11:17:46 +0200
+
+silx (0.10.1+dfsg-1~exp1) experimental; urgency=medium
+
+  * New upstream version 0.10.1+dfsg
+  * d/patches
+    + 0004-fix-missing-import.patch (Added)
+
+ -- Picca Frédéric-Emmanuel <picca@debian.org>  Tue, 28 May 2019 08:20:44 +0200
+
+silx (0.9.0+dfsg-3) unstable; urgency=medium
+
+  * d/rules: Do not run Qt test for now.
+  * d/t/control.autodep8: Fixed to run test for real.
+
+ -- Picca Frédéric-Emmanuel <picca@debian.org>  Thu, 21 Feb 2019 11:22:03 +0100
+
+silx (0.9.0+dfsg-2) unstable; urgency=medium
+
+  * d/patches:
+    + 0004-fix-FTBFS-with-numpy-0.16.patch (Added)
+
+ -- Picca Frédéric-Emmanuel <picca@debian.org>  Thu, 20 Dec 2018 16:21:18 +0100
+
+silx (0.9.0+dfsg-1) unstable; urgency=medium
+
+  [ Picca Frédéric-Emmanuel ]
+  * Fixed autopkgtests and use control.autodep8
+  * Used salsa-ci for continuous integration.
+  * Run autopkgtests via xvfb-run
+  * d/control: Removed Build-Depends: python-lxml[-dbg], python-enum34.
+
+  [ Alexandre Marie ]
+  * New upstream version 0.9.0+dfsg
+  * d/watch: uversionmangling to deal with rc|alpha|beta versions.
+
+ -- Alexandre Marie <alexandre.marie@synchrotron-soleil.fr>  Mon, 17 Dec 2018 13:25:52 +0100
+
+silx (0.8.0+dfsg-1) unstable; urgency=medium
+
+  * New upstream version 0.8.0+dfsg
+  * Added the pub 4096R/26F8E116 key to keyring
+      2016-04-11 Thomas Vincent <thomas.vincent@esrf.fr>
+  * d/control
+    - Build-Depends
+      + Added pandoc
+    - Removed obsolete X-Python[3]-Version
+  * d/rules
+    - Installed the QtDesgigner files only for Qt5.
+    - Override dh_python3 to deal with qtdesigner files.
+    - Run sphinx with xvfb in order to have the right silx.sx documentation.
+    - Avoid QT warnings by setting XDG_RUNTIME_DIR
+
+ -- Picca Frédéric-Emmanuel <picca@debian.org>  Tue, 31 Jul 2018 16:24:57 +0200
+
+silx (0.7.0+dfsg-2) unstable; urgency=medium
+
+  * d/rules
+    - use py3versions to get the python3 default interpreter version.
+      This makes the package backportable.
+
+ -- Picca Frédéric-Emmanuel <picca@debian.org>  Tue, 13 Mar 2018 20:04:20 +0100
+
+silx (0.7.0+dfsg-1) unstable; urgency=medium
+
+  * New upstream version 0.7.0+dfsg
+  * Bumped Strandards-Versions to 4.1.3 (nothing to do)
+  * d/control
+    - Build-Depends
+     + Added python[3]-nbsphinx, python-concurrent.futures
+  * d/copyright
+    remove the third_party _local files.
+  * d/patches
+     + 0003-do-not-modify-PYTHONPATH-from-setup.py.patch (added)
+     - 0005-slocale.h-is-removed-in-GLIBC-2.26.patch (obsolete)
+     - 0006-prefer-pyqt5-over-pyside.patch (obsolete)
+  * d/rules
+    - removed the jessie backports specific code
+    - compile extensions only once per interpreter.
+    - unactive for now the build time tests.
+    - build the doc only with python3.
+  * d/watch
+    - check the pgp signature
+
+ -- Picca Frédéric-Emmanuel <picca@debian.org>  Tue, 13 Mar 2018 07:32:00 +0100
+
+silx (0.6.1+dfsg-2) unstable; urgency=medium
+
+  * d/control
+    - Bump Standrad-Version 4.1.1 (nothing to do)
+  * fixed glibc 2.26 FTBFS with upstream patch glib2.26 (Closes: #882881)
+  * d/patches
+    + 0005-slocale.h-is-removed-in-GLIBC-2.26.patch (Added)
+
+ -- Picca Frédéric-Emmanuel <picca@debian.org>  Sun, 21 Jan 2018 09:32:38 +0100
+
+silx (0.6.1+dfsg-1) unstable; urgency=medium
+
+  * New upstream version 0.6.1+dfsg
+  * update watch file
+
+ -- Picca Frédéric-Emmanuel <picca@debian.org>  Sat, 25 Nov 2017 17:02:19 +0100
+
+silx (0.6.0+dfsg-1) unstable; 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
+
+silx (0.5.0+dfsg-2) unstable; urgency=medium
+
+  * d/control
+    - Added all the -dbg dependencies for the -dbg packages.
+
+ -- Picca Frédéric-Emmanuel <picca@debian.org>  Fri, 01 Sep 2017 15:10:44 +0200
+
+silx (0.5.0+dfsg-1) unstable; urgency=medium
+
+  * Initial release (Closes: #871637)
+
+ -- Picca Frédéric-Emmanuel <picca@debian.org>  Wed, 02 Aug 2017 11:00:20 +0100
diff --git a/package/debian10/compat b/package/debian10/compat
new file mode 100644
index 0000000..f599e28
--- /dev/null
+++ b/package/debian10/compat
@@ -0,0 +1 @@
+10
diff --git a/package/debian10/control b/package/debian10/control
new file mode 100644
index 0000000..f16ccea
--- /dev/null
+++ b/package/debian10/control
@@ -0,0 +1,172 @@
+Source: silx
+Maintainer: Debian Science Maintainers <debian-science-maintainers@lists.alioth.debian.org>
+Uploaders: Jerome Kieffer <jerome.kieffer@esrf.fr>,
+           Picca Frédéric-Emmanuel <picca@debian.org>,
+           Alexandre Marie <alexandre.marie@synchrotron-soleil.fr>
+Section: science
+Priority: optional
+Build-Depends: cython (>= 0.23.2),
+               cython3 (>= 0.23.2),
+               debhelper (>= 10),
+               dh-python,
+               help2man,
+               ipython,
+               ipython-qtconsole,
+               ipython3,
+               ipython3-qtconsole,
+	       pandoc <!nodoc>,
+               python-all-dev,
+               python-concurrent.futures,
+               python-fabio,
+               python-h5py,
+               python-mako,
+               python-matplotlib,
+               python-nbsphinx <!nodoc>,
+               python-numpy,
+               python-opengl,
+               python-pil,
+               python-pyopencl,
+               python-pyqt5,
+               python-pyqt5.qtopengl,
+               python-pyqt5.qtsvg,
+               python-scipy,
+               python-setuptools,
+               python-sphinx,
+               python-sphinxcontrib.programoutput,
+               python3-all-dev,
+               python3-dateutil,
+               python3-qtconsole,
+               python3-six,
+               python3-fabio,
+               python3-h5py,
+               python3-mako,
+               python3-matplotlib,
+               python3-nbsphinx <!nodoc>,
+               python3-numpy,
+               python3-opengl,
+               python3-pil,
+               python3-pyopencl,
+               python3-pyqt5,
+               python3-pyqt5.qtopengl,
+               python3-pyqt5.qtsvg,
+               python3-scipy,
+               python3-setuptools,
+               python3-sphinx,
+               python3-sphinxcontrib.programoutput,
+               xauth,
+               xvfb,
+               openstack-pkg-tools,
+               locales,
+               devscripts
+Standards-Version: 4.1.3
+Vcs-Browser: https://salsa.debian.org/science-team/silx
+Vcs-Git: https://salsa.debian.org/science-team/silx.git
+Homepage: https://github.com/silx-kit/silx
+
+Package: silx
+Architecture: all
+Depends: python3-silx (>= ${source:Version}),
+         ${misc:Depends},
+         ${python3:Depends},
+         ${shlibs:Depends}
+Description: Toolbox for X-Ray data analysis - Executables
+ The silx project aims at providing a collection of Python packages to
+ support the development of data assessment, reduction and analysis
+ applications at synchrotron radiation facilities. It aims at
+ providing reading/writing different file formats, data reduction
+ routines and a set of Qt widgets to browse and visualize data.
+ .
+ The current version provides :
+ .
+  * reading HDF5 file format (with support of SPEC file format)
+  * histogramming
+  * fitting
+  * 1D and 2D visualization using multiple backends (matplotlib or OpenGL)
+  * image plot widget with a set of associated tools (See changelog file).
+  * Unified browser for HDF5, SPEC and image file formats supporting inspection
+    and visualization of n-dimensional datasets.
+  * Unified viewer (silx view filename) for HDF5, SPEC and image file formats
+  * OpenGL-based widget to display 3D scalar field with
+    isosurface and cutting plane.
+ .
+ This uses the Python 3 version of the package.
+
+Package: python-silx
+Architecture: any
+Section: python
+Depends: ${misc:Depends}, ${python:Depends}, ${shlibs:Depends}
+Description: Toolbox for X-Ray data analysis - Python2 library
+ The silx project aims at providing a collection of Python packages to
+ support the development of data assessment, reduction and analysis
+ applications at synchrotron radiation facilities. It aims at
+ providing reading/writing different file formats, data reduction
+ routines and a set of Qt widgets to browse and visualize data.
+ .
+ The current version provides :
+ .
+  * reading HDF5 file format (with support of SPEC file format)
+  * histogramming
+  * fitting
+  * 1D and 2D visualization using multiple backends (matplotlib or OpenGL)
+  * image plot widget with a set of associated tools (See changelog file).
+  * Unified browser for HDF5, SPEC and image file formats supporting inspection
+    and visualization of n-dimensional datasets.
+  * Unified viewer (silx view filename) for HDF5, SPEC and image file formats
+  * OpenGL-based widget to display 3D scalar field with
+    isosurface and cutting plane.
+ .
+ This is the Python 2 version of the package.
+
+
+Package: python3-silx
+Architecture: any
+Section: python
+Depends: ${misc:Depends}, ${python3:Depends}, ${shlibs:Depends}
+Description: Toolbox for X-Ray data analysis - Python3
+ The silx project aims at providing a collection of Python packages to
+ support the development of data assessment, reduction and analysis
+ applications at synchrotron radiation facilities. It aims at
+ providing reading/writing different file formats, data reduction
+ routines and a set of Qt widgets to browse and visualize data.
+ .
+ The current version provides :
+ .
+  * reading HDF5 file format (with support of SPEC file format)
+  * histogramming
+  * fitting
+  * 1D and 2D visualization using multiple backends (matplotlib or OpenGL)
+  * image plot widget with a set of associated tools (See changelog file).
+  * Unified browser for HDF5, SPEC and image file formats supporting inspection
+    and visualization of n-dimensional datasets.
+  * Unified viewer (silx view filename) for HDF5, SPEC and image file formats
+  * OpenGL-based widget to display 3D scalar field with
+    isosurface and cutting plane.
+ .
+ This is the Python 3 version of the package.
+
+
+Package: python-silx-doc
+Architecture: all
+Section: doc
+Depends: libjs-mathjax, ${misc:Depends}, ${sphinxdoc:Depends}
+Description: Toolbox for X-Ray data analysis - Documentation
+ The silx project aims at providing a collection of Python packages to
+ support the development of data assessment, reduction and analysis
+ applications at synchrotron radiation facilities. It aims at
+ providing reading/writing different file formats, data reduction
+ routines and a set of Qt widgets to browse and visualize data.
+ .
+ The current version provides :
+ .
+  * reading HDF5 file format (with support of SPEC file format)
+  * histogramming
+  * fitting
+  * 1D and 2D visualization using multiple backends (matplotlib or OpenGL)
+  * image plot widget with a set of associated tools (See changelog file).
+  * Unified browser for HDF5, SPEC and image file formats supporting inspection
+    and visualization of n-dimensional datasets.
+  * Unified viewer (silx view filename) for HDF5, SPEC and image file formats
+  * OpenGL-based widget to display 3D scalar field with
+    isosurface and cutting plane.
+ .
+ This is the common documentation package.
diff --git a/package/debian8/gbp.conf b/package/debian10/gbp.conf
index f68d262..f68d262 100644
--- a/package/debian8/gbp.conf
+++ b/package/debian10/gbp.conf
diff --git a/package/debian10/patches/0002-use-the-system-mathjax-privacy-breach.patch b/package/debian10/patches/0002-use-the-system-mathjax-privacy-breach.patch
new file mode 100644
index 0000000..04deea7
--- /dev/null
+++ b/package/debian10/patches/0002-use-the-system-mathjax-privacy-breach.patch
@@ -0,0 +1,25 @@
+From: =?utf-8?q?Picca_Fr=C3=A9d=C3=A9ric-Emmanuel?=
+ <picca@synchrotron-soleil.fr>
+Date: Thu, 10 Aug 2017 10:19:39 +0200
+Subject: use the system mathjax (privacy breach)
+
+---
+ doc/source/conf.py | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/doc/source/conf.py b/doc/source/conf.py
+index 86dbccf..18bfce2 100644
+--- a/doc/source/conf.py
++++ b/doc/source/conf.py
+@@ -143,6 +143,11 @@ pygments_style = 'sphinx'
+ # A list of ignored prefixes for module index sorting.
+ # modindex_common_prefix = []
+ 
++# -- Option for MathJax extension ----------------------------------------------
++
++# Override required in order to use Debian's system mathjax
++mathjax_path = 'file:///usr/share/javascript/mathjax/MathJax.js?config=TeX-AMS-MML_HTMLorMML'
++
+ 
+ # -- Options for HTML output ---------------------------------------------------
+ 
diff --git a/package/debian10/patches/0003-do-not-modify-PYTHONPATH-from-setup.py.patch b/package/debian10/patches/0003-do-not-modify-PYTHONPATH-from-setup.py.patch
new file mode 100644
index 0000000..e58e985
--- /dev/null
+++ b/package/debian10/patches/0003-do-not-modify-PYTHONPATH-from-setup.py.patch
@@ -0,0 +1,22 @@
+From: =?utf-8?q?Picca_Fr=C3=A9d=C3=A9ric-Emmanuel?= <picca@debian.org>
+Date: Sun, 4 Mar 2018 16:36:35 +0100
+Subject: do not modify PYTHONPATH from setup.py
+
+---
+ setup.py | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
+index b63d0eb..334f7a8 100644
+--- a/setup.py
++++ b/setup.py
+@@ -260,7 +260,8 @@ class BuildMan(Command):
+         path.insert(0, os.path.abspath(build.build_lib))
+ 
+         env = dict((str(k), str(v)) for k, v in os.environ.items())
+-        env["PYTHONPATH"] = os.pathsep.join(path)
++
++        # env["PYTHONPATH"] = os.pathsep.join(path)
+         if not os.path.isdir("build/man"):
+             os.makedirs("build/man")
+         import subprocess
diff --git a/package/debian10/patches/series b/package/debian10/patches/series
new file mode 100644
index 0000000..e3795b3
--- /dev/null
+++ b/package/debian10/patches/series
@@ -0,0 +1,2 @@
+0002-use-the-system-mathjax-privacy-breach.patch
+0003-do-not-modify-PYTHONPATH-from-setup.py.patch
diff --git a/package/debian10/py3dist-overrides b/package/debian10/py3dist-overrides
new file mode 100644
index 0000000..2c4ce13
--- /dev/null
+++ b/package/debian10/py3dist-overrides
@@ -0,0 +1 @@
+pyqt5 python3-pyqt5,python3-pyqt5.qtopengl,python3-pyqt5.qtsvg
\ No newline at end of file
diff --git a/package/debian8/python-silx-doc.doc-base b/package/debian10/python-silx-doc.doc-base
index b290d8a..b290d8a 100644
--- a/package/debian8/python-silx-doc.doc-base
+++ b/package/debian10/python-silx-doc.doc-base
diff --git a/package/debian10/rules b/package/debian10/rules
new file mode 100755
index 0000000..b75711c
--- /dev/null
+++ b/package/debian10/rules
@@ -0,0 +1,85 @@
+#!/usr/bin/make -f
+
+# avoir bbuild FTBFS
+export HOME=$(CURDIR)/debian/tmp-home
+export XDG_RUNTIME_DIR=$(HOME)/runtime
+export POCL_CACHE_DIR=$(HOME)/.cache/
+
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+export PYBUILD_AFTER_INSTALL=rm -rf {destdir}/usr/bin/
+export PYBUILD_NAME=silx
+export SPECFILE_USE_GNU_SOURCE=1
+export SILX_FULL_INSTALL_REQUIRES=1
+
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
+# Make does not offer a recursive wildcard function, so here's one:
+rwildcard=$(wildcard $1$2) $(foreach d,$(wildcard $1*),$(call rwildcard,$d/,$2))
+
+# How to recursively find all files with the same name in a given folder
+ALL_PYX := $(call rwildcard,silx/,*.pyx)
+#NOTA: No space before *
+
+# get the default python3 interpreter version
+PY3VER := $(shell py3versions -dv)
+
+%:
+	dh $@ --with python2,python3,sphinxdoc --buildsystem=pybuild
+
+override_dh_clean:
+	dh_clean
+	# remove the cython generated file to force rebuild
+	rm -f $(patsubst %.pyx,%.cpp,${ALL_PYX})
+	rm -f $(patsubst %.pyx,%.c,${ALL_PYX})
+	rm -f $(patsubst %.pyx,%.html,${ALL_PYX})
+	rm -rf doc/build/html
+	rm -rf build/man
+	rm -rf *.egg-info
+
+override_dh_auto_build:
+	dh_auto_build
+	# build man pages
+	dh_auto_build -- -s custom --build-args="env PYTHONPATH={build_dir} {interpreter} setup.py build_man"
+
+override_dh_install:
+	dh_numpy
+	dh_numpy3
+
+	# install scripts into silx
+	python3 setup.py install_scripts -d debian/silx/usr/bin
+	dh_install -p silx package/desktop/*.desktop usr/share/applications
+	dh_install -p silx package/desktop/silx.png usr/share/icons/hicolor/48x48/apps
+	dh_install -p silx package/desktop/silx.svg usr/share/icons/hicolor/scalable/apps
+	dh_install -p silx package/desktop/silx.xml usr/share/mime/packages
+
+	# install the qtdesigner files only for the python3 package
+	dh_install -p python3-silx qtdesigner_plugins/*.py /usr/lib/$(DEB_HOST_MULTIARCH)/qt5/plugins/designer/python
+
+	dh_install
+
+override_dh_python3:
+	dh_python3
+	dh_python3 -p python3-silx /usr/lib/$(DEB_HOST_MULTIARCH)/qt5/plugins/designer/python
+
+# WITH_QT_TEST=False to disable graphical tests
+# SILX_OPENCL=False to disable OpenCL tests
+# SILX_TEST_LOW_MEM=True to disable tests taking large amount of memory
+# GPU=False to disable the use of a GPU with OpenCL test
+# WITH_GL_TEST=False to disable tests using OpenGL
+# UNACTIVATED UNTIL dh_python from UNSTABLE IS FIXED
+# https://lists.debian.org/debian-python/2017/08/msg00095.html
+override_dh_auto_test:
+	mkdir -p $(POCL_CACHE_DIR) # create POCL cachedir in order to avoid an FTBFS in sbuild
+	dh_auto_test -- -s custom --test-args="env PYTHONPATH={build_dir} GPU=False WITH_QT_TEST=False SILX_OPENCL=False SILX_TEST_LAW_MEM=True xvfb-run -a --server-args=\"-screen 0 1024x768x24\" {interpreter} run_tests.py -vv --installed"
+
+override_dh_installman:
+	dh_installman -p silx build/man/*.1
+
+override_dh_sphinxdoc:
+ifeq (,$(findstring nodocs, $(DEB_BUILD_OPTIONS)))
+	#mkdir -p $(POCL_CACHE_DIR) # create POCL cachedir in order to avoid an FTBFS in sbuild
+	mkdir -p -m 700 $(XDG_RUNTIME_DIR)
+	pybuild --build -s custom -p $(PY3VER) --build-args="cd doc && env PYTHONPATH={build_dir} http_proxy='127.0.0.1:9' xvfb-run -a --server-args=\"-screen 0 1024x768x24\" {interpreter} -m sphinx -N -bhtml source build/html"
+	dh_installdocs "doc/build/html" -p python-silx-doc
+	dh_sphinxdoc -O--buildsystem=pybuild
+endif
diff --git a/package/debian8/source/format b/package/debian10/source/format
index 163aaf8..163aaf8 100644
--- a/package/debian8/source/format
+++ b/package/debian10/source/format
diff --git a/package/debian8/source/options b/package/debian10/source/options
index 6e88e49..6e88e49 100644
--- a/package/debian8/source/options
+++ b/package/debian10/source/options
diff --git a/package/debian10/tests/control b/package/debian10/tests/control
new file mode 100644
index 0000000..1e5cddf
--- /dev/null
+++ b/package/debian10/tests/control
@@ -0,0 +1,31 @@
+Test-Command: set -efu
+ ; for py in $(pyversions -r 2>/dev/null)
+ ; do cd "$AUTOPKGTEST_TMP"
+ ; echo "Testing with $py:"
+ ; xvfb-run -a --server-args="-screen 0 1024x768x24" $py -c "import silx.test; silx.test.run_tests()" 2>&1
+ ; done
+Depends: python-all, python-silx, xauth, xvfb
+
+Test-Command: set -efu
+ ; for py in $(pyversions -r 2>/dev/null)
+ ; do cd "$AUTOPKGTEST_TMP"
+ ; echo "Testing with $py-dbg:"
+ ; xvfb-run -a --server-args="-screen 0 1024x768x24" $py-dbg -c "import silx.test; silx.test.run_tests()" 2>&1
+ ; done
+Depends: python-all-dbg, python-silx-dbg, xauth, xvfb
+
+Test-Command: set -efu
+ ; for py in $(py3versions -r 2>/dev/null)
+ ; do cd "$AUTOPKGTEST_TMP"
+ ; echo "Testing with $py:"
+ ; xvfb-run -a --server-args="-screen 0 1024x768x24" $py -c "import silx.test; silx.test.run_tests()" 2>&1
+ ; done
+Depends: python3-all, python3-silx, xauth, xvfb
+
+Test-Command: set -efu
+ ; for py in $(py3versions -r 2>/dev/null)
+ ; do cd "$AUTOPKGTEST_TMP"
+ ; echo "Testing with $py-dbg:"
+ ; xvfb-run -a --server-args="-screen 0 1024x768x24" $py-dbg -c "import silx.test; silx.test.run_tests()" 2>&1
+ ; done
+Depends: python3-all-dbg, python3-silx-dbg, xauth, xvfb
diff --git a/package/debian10/watch b/package/debian10/watch
new file mode 100644
index 0000000..99444f9
--- /dev/null
+++ b/package/debian10/watch
@@ -0,0 +1,7 @@
+version=4
+opts=repacksuffix=+dfsg,\
+pgpsigurlmangle=s/$/.asc/,\
+dversionmangle=s/\+dfsg//,\
+uversionmangle=s/(rc|a|b|c)/~$1/ \
+https://pypi.python.org/packages/source/s/@PACKAGE@/ \
+ @PACKAGE@-@ANY_VERSION@@ARCHIVE_EXT@ debian uupdate
diff --git a/package/debian8/changelog b/package/debian8/changelog
deleted file mode 100644
index 763d069..0000000
--- a/package/debian8/changelog
+++ /dev/null
@@ -1,22 +0,0 @@
-silx (0.3.0-1) unstable; urgency=low
-
-  * debian/control
-    - Add missing dependencies
-    - Add -dbg packages
-  * Upstream version 0.4.0a
-
- -- Thomas Vincent <tvincent@edna-site.org>  Mon, 23 Jan 2017 17:09:20 +0100
-
-silx (0.1.0-1) unstable; urgency=low
-
-  * debian/control
-    - Comment -dbg packages
-  * Upstream version 0.1.0
-
- -- Thomas Vincent <thomas.vincent@esrf.fr>  Thu, 14 Apr 2016 09:35:28 +0200
-
-silx (0.0.0-1) unstable; urgency=low
-
-  * Initial release (Closes: #??????)
-
- -- Jerome Kieffer <jerome.kieffer@esrf.fr>  Tue, 15 Mar 2016 11:00:20 +0100
diff --git a/package/debian8/clean b/package/debian8/clean
deleted file mode 100644
index 668a363..0000000
--- a/package/debian8/clean
+++ /dev/null
@@ -1 +0,0 @@
-*.egg-info/*
\ No newline at end of file
diff --git a/package/debian8/compat b/package/debian8/compat
deleted file mode 100644
index ec63514..0000000
--- a/package/debian8/compat
+++ /dev/null
@@ -1 +0,0 @@
-9
diff --git a/package/debian8/control b/package/debian8/control
deleted file mode 100644
index 2e3fc58..0000000
--- a/package/debian8/control
+++ /dev/null
@@ -1,134 +0,0 @@
-Source: silx
-Maintainer: Debian Science Maintainers <debian-science-maintainers@lists.alioth.debian.org>
-Uploaders: Jerome Kieffer <jerome.kieffer@esrf.fr>,
-           Picca Frédéric-Emmanuel <picca@debian.org>
-Section: science
-Priority: extra
-Build-Depends: cython,
-               cython3,
-               libstdc++-4.9-dev,
-               libstdc++6,
-               debhelper (>=9.20150101+deb8u2),
-               dh-python,
-               python-all-dev,
-               python-numpy,
-               python-fabio,
-               python-h5py,
-               python-pyopencl,
-               python-mako,
-               python-matplotlib,
-               python-nbsphinx,
-               python-dateutil,
-               python-opengl,
-               python-pyqt5,
-               python-pyqt5.qtsvg,
-               python-pyqt5.qtopengl,
-               python-scipy,
-               python-setuptools,
-               python-six,
-               python-sphinx,
-               python-sphinxcontrib.programoutput,
-               python-enum34,
-               python-concurrent.futures,
-               python3-all-dev,
-               python3-numpy,
-               python3-fabio,
-               python3-h5py,
-               python3-pyopencl,
-               python3-mako,
-               python3-matplotlib,
-               python3-nbsphinx,
-               python3-dateutil,
-               python3-opengl,
-               python3-pyqt5,
-               python3-pyqt5.qtsvg,
-               python3-pyqt5.qtopengl,
-               python3-scipy,
-               python3-setuptools,
-               python3-six,
-               python3-sphinx,
-               python3-sphinxcontrib.programoutput,
-               help2man,
-               devscripts
-Standards-Version: 3.9.6
-Vcs-Browser: https://anonscm.debian.org/cgit/debian-science/packages/silx.git
-Vcs-Git: git://anonscm.debian.org/debian-science/packages/silx.git
-Homepage: https://github.com/silx-kit/silx
-X-Python-Version: >= 2.7
-X-Python3-Version: >= 3.4
-
-Package: silx
-Architecture: all
-Depends: ${misc:Depends},
-         ${python:Depends},
-         ${shlibs:Depends},
-         python3-pkg-resources,
-         python3-silx (>= ${source:Version})
-Description: Toolbox for X-Ray data analysis - Executables
- .
- This uses the Python 3 version of the package.
-
-Package: python-silx
-Architecture: any
-Section: python
-Depends: ${misc:Depends},
-         ${python:Depends},
-         ${shlibs:Depends},
-         libstdc++6,
-         python-numpy,
-         python-fabio,
-         python-h5py,
-         python-pyopencl,
-         python-mako,
-         python-matplotlib,
-         python-dateutil,
-         python-opengl,
-         python-pyqt5,
-         python-pyqt5.qtsvg,
-         python-pyqt5.qtopengl,
-         python-scipy,
-         python-setuptools,
-         python-six,
-         python-enum34,
-         python-concurrent.futures,
-# Recommends:
-Suggests: python-rfoo
-Description: Toolbox for X-Ray data analysis - Python2 library
- .
- This is the Python 2 version of the package.
-
-Package: python3-silx
-Architecture: any
-Section: python
-Depends: ${misc:Depends},
-         ${python3:Depends},
-         ${shlibs:Depends},
-         libstdc++6,
-         python3-numpy,
-         python3-fabio,
-         python3-h5py,
-         python3-pyopencl,
-         python3-mako,
-         python3-matplotlib,
-         python3-dateutil,
-         python3-opengl,
-         python3-pyqt5,
-         python3-pyqt5.qtsvg,
-         python3-pyqt5.qtopengl,
-         python3-scipy,
-         python3-setuptools,
-         python3-six,
-# Recommends:
-# Suggests: python3-rfoo
-Description: Toolbox for X-Ray data analysis - Python3
- .
- This is the Python 3 version of the package.
-
-Package: python-silx-doc
-Architecture: all
-Section: doc
-Depends: ${misc:Depends},
-         ${sphinxdoc:Depends}
-Description: Toolbox for X-Ray data analysis - Documentation
- .
- This is the common documentation package.
diff --git a/package/debian8/rules b/package/debian8/rules
deleted file mode 100755
index 160147b..0000000
--- a/package/debian8/rules
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/usr/bin/make -f
-
-export PYBUILD_NAME=silx
-export SPECFILE_USE_GNU_SOURCE=1
-
-# Make does not offer a recursive wildcard function, so here's one:
-rwildcard=$(wildcard $1$2) $(foreach d,$(wildcard $1*),$(call rwildcard,$d/,$2))
-
-# How to recursively find all files with the same name in a given folder
-ALL_PYX := $(call rwildcard,silx/,*.pyx)
-#NOTA: No space before *
-
-%:
-	dh $@ --with python2,python3 --buildsystem=pybuild
-
-override_dh_clean:
-	dh_clean
-	# remove the cython generated file to force rebuild
-	rm -f $(patsubst %.pyx,%.cpp,${ALL_PYX})
-	rm -f $(patsubst %.pyx,%.c,${ALL_PYX})
-	rm -f $(patsubst %.pyx,%.html,${ALL_PYX})
-	rm -rf build/html
-	rm -rf *.egg-info
-
-override_dh_auto_build:
-	dh_auto_build
-	python setup.py build build_man build_doc
-
-override_dh_install:
-	dh_numpy
-	dh_numpy3
-
-	# move the scripts to right package
-	dh_install -p silx debian/python3-silx/usr/bin/* usr/bin
-	dh_install -p silx package/desktop/*.desktop usr/share/applications
-	dh_install -p silx package/desktop/silx.png usr/share/icons/hicolor/48x48/apps
-	dh_install -p silx package/desktop/silx.svg usr/share/icons/hicolor/scalable/apps
-	dh_install -p silx package/desktop/silx.xml usr/share/mime/packages
-	rm -rf debian/python-silx/usr/bin
-	rm -rf debian/python3-silx/usr/bin
-
-	dh_install
-
-override_dh_auto_test:
-	dh_auto_test -- -s custom --test-args="env PYTHONPATH={build_dir} WITH_QT_TEST=False {interpreter} run_tests.py -v"
-
-override_dh_installman:
-	dh_installman -p silx build/man/*.1
-
-override_dh_installdocs:
-	dh_installdocs "build/sphinx/html" -p python-silx-doc
-	dh_installdocs
diff --git a/package/debian8/watch b/package/debian8/watch
deleted file mode 100644
index 8972716..0000000
--- a/package/debian8/watch
+++ /dev/null
@@ -1,5 +0,0 @@
-version=3
-opts=repacksuffix=+dfsg,\
-uversionmangle=s/(rc|a|b|c)/~$1/,\
-dversionmangle=s/\+dfsg// \
-http://pypi.debian.net/silx/silx-(.+)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))
diff --git a/package/debian9/control b/package/debian9/control
index d0de5fe..4abe0fe 100644
--- a/package/debian9/control
+++ b/package/debian9/control
@@ -63,7 +63,7 @@ X-Python3-Version: >= 3.4
 Package: silx
 Architecture: all
 Depends: ${misc:Depends},
-         ${python:Depends},
+         ${python3:Depends},
          ${shlibs:Depends},
          python3-pkg-resources,
          python3-silx (>= ${source:Version})