debian/control - swap order of Build-Depends (and Recommends just in case) to favor python*-pil over python*-imaging so builders do not get confused

(Closes: #730678)
This commit is contained in:
Yaroslav Halchenko
2013-11-29 19:51:54 -05:00
parent f23d36f12d
commit 2713d32095
2 changed files with 13 additions and 4 deletions
+9
View File
@@ -1,3 +1,12 @@
skimage (0.9.3-3) unstable; urgency=low
* debian/control
- swap order of Build-Depends (and Recommends just in case) to favor
python*-pil over python*-imaging so builders do not get confused
(Closes: #730678)
-- Yaroslav Halchenko <debian@onerussian.com> Fri, 29 Nov 2013 19:50:11 -0500
skimage (0.9.3-2) unstable; urgency=low
* debian/tests/control
+4 -4
View File
@@ -8,7 +8,7 @@ Build-Depends: cython (>= 0.15),
debhelper (>= 9~),
libfreeimage3,
python-all-dev (>= 2.6.6-3~),
python-imaging | python-pil,
python-pil | python-imaging,
python-matplotlib (>= 1.0),
python-nose,
python-numpy,
@@ -16,7 +16,7 @@ Build-Depends: cython (>= 0.15),
python-setuptools,
python-sphinx (>= 1.0.7+dfsg-1~),
python3-all-dev,
python3-imaging | python3-pil,
python3-pil | python3-imaging,
python3-matplotlib | python-matplotlib (<< 1.2.0~),
python3-nose,
python3-numpy,
@@ -38,7 +38,7 @@ Depends: libfreeimage3,
python-skimage-lib (>= ${source:Version}),
${misc:Depends},
${python:Depends}
Recommends: python-imaging, python-pil, python-matplotlib (>= 1.0), python-nose, python-qt4
Recommends: python-pil, python-imaging, python-matplotlib (>= 1.0), python-nose, python-qt4
Suggests: python-opencv, python-skimage-doc
Description: Python modules for image processing
scikit-image is a collection of image processing algorithms for
@@ -55,7 +55,7 @@ Depends: libfreeimage3,
python3-skimage-lib (>= ${source:Version}),
${misc:Depends},
${python3:Depends}
Recommends: python3-imaging, python3-pil, python3-matplotlib (>= 1.0), python3-nose
Recommends: python3-pil,python3-imaging, python3-matplotlib (>= 1.0), python3-nose
Suggests: python-skimage-doc
Description: Python 3 modules for image processing
scikit-image is a collection of image processing algorithms for