[pyfai] 11/19: wrap_and_sort + cme fix dpkg
Frédéric-Emmanuel Picca
picca at moszumanska.debian.org
Tue Aug 29 12:34:07 UTC 2017
This is an automated email from the git hooks/post-receive script.
picca pushed a commit to branch master
in repository pyfai.
commit b77a31e1d972f27dbffc1933905f5988b425642d
Author: Picca Frédéric-Emmanuel <picca at synchrotron-soleil.fr>
Date: Fri Aug 18 15:08:07 2017 +0200
wrap_and_sort + cme fix dpkg
---
debian/compat | 2 +-
debian/control | 91 +++++++++++++++++++++++++++++++---------------------------
debian/rules | 2 +-
3 files changed, 51 insertions(+), 44 deletions(-)
diff --git a/debian/compat b/debian/compat
index ec63514..f599e28 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/control b/debian/control
index c4b8fe8..806f84f 100644
--- a/debian/control
+++ b/debian/control
@@ -4,49 +4,56 @@ Uploaders: Jerome Kieffer <jerome.kieffer at esrf.fr>,
Picca Frédéric-Emmanuel <picca at debian.org>
Section: science
Testsuite: autopkgtest
-Priority: extra
+Priority: optional
Build-Depends: cython,
cython-dbg,
cython3,
cython3-dbg,
- debhelper (>= 9),
+ debhelper (>= 10),
dh-python,
libjs-mathjax,
- python-all-dev,
python-all-dbg,
+ python-all-dev,
python-fabio (>= 0.3.0+dfsg-1~),
python-fabio-dbg (>= 0.3.0+dfsg-1~),
python-h5py,
+ python-h5py-dbg,
python-lxml,
python-lxml-dbg,
python-matplotlib,
python-matplotlib-dbg,
python-numpy,
python-numpy-dbg,
- python-qt4,
- python-qt4-dbg,
+ python-pyqt5,
+ python-pyqt5-dbg,
python-scipy,
python-scipy-dbg,
python-setuptools,
+ python-silx,
+ python-silx-dbg,
python-sphinx,
python-sphinxcontrib.programoutput,
python-tk,
python-tk-dbg,
- python3-all-dev,
python3-all-dbg,
+ python3-all-dev,
python3-fabio,
python3-fabio-dbg,
+ python3-h5py,
+ python3-h5py-dbg,
python3-lxml,
python3-lxml-dbg,
python3-matplotlib,
python3-matplotlib-dbg,
python3-numpy,
python3-numpy-dbg,
- python3-pyqt4,
- python3-pyqt4-dbg,
+ python3-pyqt5,
+ python3-pyqt5-dbg,
python3-scipy,
python3-scipy-dbg,
python3-setuptools,
+ python3-silx,
+ python3-silx-dbg,
python3-sphinx,
python3-sphinxcontrib.programoutput,
python3-tk,
@@ -55,15 +62,15 @@ Standards-Version: 3.9.8
Vcs-Browser: https://anonscm.debian.org/cgit/debian-science/packages/pyfai.git
Vcs-Git: https://anonscm.debian.org/git/debian-science/packages/pyfai.git
Homepage: https://github.com/silx-kit/pyFAI
-X-Python-Version: >= 2.6
-X-Python3-Version: >= 3.2
+X-Python-Version: >= 2.7
+X-Python3-Version: >= 3.4
Package: pyfai
Architecture: all
-Depends: ${misc:Depends},
+Depends: python-pyfai (>= ${source:Version}),
+ ${misc:Depends},
${python:Depends},
- ${shlibs:Depends},
- python-pyfai (>= ${source:Version})
+ ${shlibs:Depends}
Description: Fast Azimuthal Integration scripts
PyFAI is a Python library for azimuthal integration; it allows the conversion
of diffraction images taken with 2D detectors like CCD cameras into X-Ray
@@ -84,20 +91,20 @@ Description: Fast Azimuthal Integration scripts
Package: python-pyfai
Architecture: any
Section: python
-Depends: ${misc:Depends},
- ${python:Depends},
- ${shlibs:Depends},
- python-fabio (>= 0.3.0+dfsg-1~),
+Depends: python-fabio (>= 0.3.0+dfsg-1~),
python-imaging,
python-matplotlib,
- python-scipy
+ python-scipy,
+ ${misc:Depends},
+ ${python:Depends},
+ ${shlibs:Depends}
Recommends: python-h5py,
python-pyopencl,
python-qt4 | python-pyside
Suggests: pymca,
python-rfoo
-Breaks: ${python:Breaks},
- pyfai (<< 0.11.0+dfsg-2)
+Breaks: pyfai (<< 0.11.0+dfsg-2),
+ ${python:Breaks}
Replaces: pyfai (<< 0.11.0+dfsg-2)
Description: Fast Azimuthal Integration scripts - Python2
PyFAI is a Python library for azimuthal integration; it allows the conversion
@@ -121,14 +128,14 @@ Description: Fast Azimuthal Integration scripts - Python2
Package: python-pyfai-dbg
Architecture: any
Section: debug
-Depends: ${misc:Depends},
- ${python:Depends},
- ${shlibs:Depends},
- python-pyfai (= ${binary:Version}),
- python-fabio-dbg (>= 0.3.0+dfsg-1~),
+Depends: python-fabio-dbg (>= 0.3.0+dfsg-1~),
python-imaging-dbg,
python-matplotlib-dbg,
- python-scipy-dbg
+ python-pyfai (= ${binary:Version}),
+ python-scipy-dbg,
+ ${misc:Depends},
+ ${python:Depends},
+ ${shlibs:Depends}
Recommends: python-dbg,
python-pyopencl-dbg,
python-qt4-dbg
@@ -156,13 +163,13 @@ Description: Fast Azimuthal Integration scripts - Python2 debug
Package: python3-pyfai
Architecture: any
Section: python
-Depends: ${misc:Depends},
- ${python3:Depends},
- ${shlibs:Depends},
- python3-fabio,
- python3-pil,
+Depends: python3-fabio,
python3-matplotlib,
- python3-scipy
+ python3-pil,
+ python3-scipy,
+ ${misc:Depends},
+ ${python3:Depends},
+ ${shlibs:Depends}
Recommends: python3-pyopencl,
python3-pyqt4 | python3-pyside
Suggests: python3-h5py
@@ -188,14 +195,14 @@ Description: Fast Azimuthal Integration scripts - Python3
Package: python3-pyfai-dbg
Architecture: any
Section: debug
-Depends: ${misc:Depends},
- ${python3:Depends},
- ${shlibs:Depends},
- python3-pyfai (= ${binary:Version}),
- python3-fabio-dbg,
- python3-pil-dbg,
+Depends: python3-fabio-dbg,
python3-matplotlib-dbg,
- python3-scipy-dbg
+ python3-pil-dbg,
+ python3-pyfai (= ${binary:Version}),
+ python3-scipy-dbg,
+ ${misc:Depends},
+ ${python3:Depends},
+ ${shlibs:Depends}
Recommends: python3-dbg,
python3-pyopencl-dbg,
python3-pyqt4-dbg | python3-pyside-dbg
@@ -223,9 +230,9 @@ Description: Fast Azimuthal Integration scripts - Python3 debug
Package: python-pyfai-doc
Architecture: all
Section: doc
-Depends: ${misc:Depends},
- ${sphinxdoc:Depends},
- libjs-mathjax
+Depends: libjs-mathjax,
+ ${misc:Depends},
+ ${sphinxdoc:Depends}
Description: Fast Azimuthal Integration scripts - Documentation
PyFAI is a Python library for azimuthal integration; it allows the conversion
of diffraction images taken with 2D detectors like CCD cameras into X-Ray
diff --git a/debian/rules b/debian/rules
index 6586e48..085c87f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,7 +17,7 @@ override_dh_auto_build:
dh_auto_build -- --after-build '{interpreter} setup.py build_man'
override_dh_auto_test:
-# PYBUILD_SYSTEM=custom \
+ PYBUILD_SYSTEM=custom \
PYBUILD_TEST_ARGS="PYTHONPATH={build_dir} PYFAI_TESTIMAGES=testimages PYFAI_DATA=$(shell pwd) {interpreter} ./run_tests.py" dh_auto_test
override_dh_install:
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/pyfai.git
More information about the debian-science-commits
mailing list