tags 751296 + patch
thanks
attached a debdiff with the update.
should fix the RC bugs, though I can't reproduce the freebsd issue.
--- skimage-0.9.3/debian/changelog 2014-01-23 21:07:58.000000000 +0100
+++ skimage-0.10.1/debian/changelog 2014-08-24 15:23:20.000000000 +0200
@@ -1,3 +1,21 @@
+skimage (0.10.1-1) unstable; urgency=medium
+
+ * New upstream release
+ * depend on and use libjs-twitter-bootstrap (Closes: #736785)
+ * doc-privacy.patch: use system font for documentation
+ * build depend on python-six (>= 1.3.0) python-numpy (>= 1.6.0) and
+ cython (>= 0.17)
+ * slicing-error.patch: fix error revealed by numpy 1.9
+ * bump standard to 3.9.5
+
+ -- Julian Taylor <jtaylor.deb...@googlemail.com> Sun, 24 Aug 2014 11:38:12
+0200
+
+skimage (0.9.3-4build1) trusty; urgency=medium
+
+ * No change rebuild to drop python3.3 compiled extension.
+
+ -- Dimitri John Ledkov <x...@ubuntu.com> Mon, 31 Mar 2014 19:36:34 +0100
+
skimage (0.9.3-4) unstable; urgency=low
* debian/rules
--- skimage-0.9.3/debian/control 2014-01-23 21:07:58.000000000 +0100
+++ skimage-0.10.1/debian/control 2014-08-24 15:23:20.000000000 +0200
@@ -3,26 +3,31 @@
Priority: optional
Maintainer: Stefan van der Walt <ste...@sun.ac.za>
Uploaders: Yaroslav Halchenko <deb...@onerussian.com>
-Build-Depends: cython (>= 0.15),
- cython3 (>= 0.15),
+Build-Depends: cython (>= 0.17),
+ cython3 (>= 0.17),
debhelper (>= 9~),
libfreeimage3,
+ libjs-twitter-bootstrap,
python-all-dev (>= 2.6.6-3~),
- python-pil | python-imaging,
python-matplotlib (>= 1.0),
python-nose,
- python-numpy,
+ python-numpy (>= 1.6.0),
+ python-pil | python-imaging,
python-scipy (>= 0.10),
python-setuptools,
+ python-six (>= 1.3.0),
python-sphinx (>= 1.0.7+dfsg-1~),
python3-all-dev,
- python3-pil | python3-imaging,
python3-matplotlib | python-matplotlib (<< 1.2.0~),
python3-nose,
python3-numpy,
+ python3-pil | python3-imaging,
python3-scipy,
- python3-setuptools
-Standards-Version: 3.9.4
+ python3-setuptools,
+ python3-six (>= 1.3.0),
+ xauth,
+ xvfb
+Standards-Version: 3.9.5
Homepage: http://scikit-image.org
Vcs-Browser: https://github.com/scikit-image/scikit-image
Vcs-Git: git://github.com/scikit-image/scikit-image.git
@@ -35,10 +40,15 @@
Depends: libfreeimage3,
python-numpy,
python-scipy (>= 0.10),
+ python-six (>= 1.3.0),
python-skimage-lib (>= ${source:Version}),
${misc:Depends},
${python:Depends}
-Recommends: python-pil, python-imaging, python-matplotlib (>= 1.0),
python-nose, python-qt4
+Recommends: python-imaging,
+ python-matplotlib (>= 1.0),
+ python-nose,
+ python-pil,
+ python-qt4
Suggests: python-opencv, python-skimage-doc
Description: Python modules for image processing
scikit-image is a collection of image processing algorithms for
@@ -52,10 +62,14 @@
Depends: libfreeimage3,
python3-numpy,
python3-scipy (>= 0.10),
+ python3-six (>= 1.3.0),
python3-skimage-lib (>= ${source:Version}),
${misc:Depends},
${python3:Depends}
-Recommends: python3-pil,python3-imaging, python3-matplotlib (>= 1.0),
python3-nose
+Recommends: python3-imaging,
+ python3-matplotlib (>= 1.0),
+ python3-nose,
+ python3-pil
Suggests: python-skimage-doc
Description: Python 3 modules for image processing
scikit-image is a collection of image processing algorithms for
--- skimage-0.9.3/debian/patches/doc-privacy.patch 1970-01-01
01:00:00.000000000 +0100
+++ skimage-0.10.1/debian/patches/doc-privacy.patch 2014-08-24
15:23:20.000000000 +0200
@@ -0,0 +1,21 @@
+Description: avoid privacy breach
+ use standard fonts instead of loading something from google
+ use local jquery from sphinx
+--- a/doc/source/themes/scikit-image/layout.html
++++ b/doc/source/themes/scikit-image/layout.html
+@@ -17,7 +17,6 @@
+ {%- endif %}
+
+ {%- macro script() %}
+- <script src="http://code.jquery.com/jquery-latest.js";></script>
+ <script src="{{ pathto('_static/', 1) }}js/bootstrap.min.js"></script>
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+@@ -37,7 +36,6 @@
+ <link rel="stylesheet" href="{{ pathto('_static/pygments.css', 1) }}"
type="text/css" />
+ <link href="{{ pathto('_static/', 1) }}css/bootstrap.min.css"
rel="stylesheet" type="text/css">
+ <link href="{{ pathto('_static/', 1) }}css/custom.css" rel="stylesheet"
type="text/css">
+- <link href="http://fonts.googleapis.com/css?family=Raleway";
rel="stylesheet" type="text/css">
+ {%- for cssfile in css_files %}
+ <link rel="stylesheet" href="{{ pathto(cssfile, 1) }}"
type="text/css" />
+ {%- endfor %}
--- skimage-0.9.3/debian/patches/series 2014-01-23 21:07:58.000000000 +0100
+++ skimage-0.10.1/debian/patches/series 2014-08-24 15:23:20.000000000
+0200
@@ -1,2 +1,4 @@
search-html.patch
fix-doc-links.patch
+doc-privacy.patch
+slicing-error.patch
--- skimage-0.9.3/debian/patches/slicing-error.patch 1970-01-01
01:00:00.000000000 +0100
+++ skimage-0.10.1/debian/patches/slicing-error.patch 2014-08-24
15:23:20.000000000 +0200
@@ -0,0 +1,19 @@
+Description: Fix slicing error revealed by numpy 1.9.0.
+ Numpy 1.9.0 no longer allows oversize data to be assigned to a
+ boolean indexed 1-d array by discarding excess elements.
+Author: Charles Harris <charlesr.har...@gmail.com>
+Origin: 7a074d5dd165536cb05fd87ea94a29510edac1a7
+Date: Fri, 4 Jul 2014 20:04:32 -0600
+Bug: https://github.com/scikit-image/scikit-image/issues/1050
+
+--- a/skimage/segmentation/_join.py
++++ b/skimage/segmentation/_join.py
+@@ -124,7 +124,7 @@ def relabel_sequential(label_field, offs
+ if m == len(labels0): # nothing to do, already 1...n labels
+ return label_field, labels, labels
+ forward_map = np.zeros(m + 1, int)
+- forward_map[labels0] = np.arange(offset, offset + len(labels0) + 1)
++ forward_map[labels0] = np.arange(offset, offset + len(labels0))
+ if not (labels == 0).any():
+ labels = np.concatenate(([0], labels))
+ inverse_map = np.zeros(offset - 1 + len(labels), dtype=np.intp)
--- skimage-0.9.3/debian/rules 2014-01-23 21:07:58.000000000 +0100
+++ skimage-0.10.1/debian/rules 2014-08-24 15:23:20.000000000 +0200
@@ -83,4 +83,9 @@
override_dh_installdocs:
dh_installdocs -A CONTRIBUTORS.txt README.md CONTRIBUTING.txt TASKS.txt
-
+ dh_link -ppython-skimage-doc
/usr/share/twitter-bootstrap/files/js/bootstrap.min.js \
+ usr/share/doc/python-skimage-doc/html/_static/js/bootstrap.min.js
+ dh_link -ppython-skimage-doc
/usr/share/twitter-bootstrap/files/css/bootstrap.min.css \
+ usr/share/doc/python-skimage-doc/html/_static/css/bootstrap.min.css
+ dh_link -ppython-skimage-doc
/usr/share/twitter-bootstrap/files/css/bootstrap-responsive.css \
+
usr/share/doc/python-skimage-doc/html/_static/css/bootstrap-responsive.css
--- skimage-0.9.3/debian/source/lintian-overrides 1970-01-01
01:00:00.000000000 +0100
+++ skimage-0.10.1/debian/source/lintian-overrides 2014-08-24
15:23:20.000000000 +0200
@@ -0,0 +1,3 @@
+# not used
+skimage source: source-contains-prebuilt-javascript-object
doc/source/themes/scikit-image/static/js/bootstrap.min.js
+skimage source: source-is-missing
doc/source/themes/scikit-image/static/js/bootstrap.min.js
--- skimage-0.9.3/debian/tests/control 2014-01-23 21:07:58.000000000 +0100
+++ skimage-0.10.1/debian/tests/control 2014-08-24 15:23:20.000000000 +0200
@@ -1,5 +1,5 @@
Tests: python2
-Depends: python-all, python-nose, python-skimage, python-pil | python-imaging,
python-matplotlib, python-tk
+Depends: python-all, python-nose, python-skimage, python-pil | python-imaging,
python-matplotlib, python-tk, xauth, xvfb
Tests: python3
-Depends: python3-all, python3-nose, python3-skimage, python3-pil |
python3-imaging, python3-matplotlib, python3-tk
+Depends: python3-all, python3-nose, python3-skimage, python3-pil |
python3-imaging, python3-matplotlib, python3-tk, xauth, xvfb
--- skimage-0.9.3/debian/tests/python2 2014-01-23 21:07:58.000000000 +0100
+++ skimage-0.10.1/debian/tests/python2 2014-08-24 15:23:20.000000000 +0200
@@ -15,5 +15,5 @@
cd "$ADTTMP"
fi
- python$py /usr/bin/nosetests -s -v skimage 2>&1
+ xvfb-run -a python$py /usr/bin/nosetests -s -v skimage 2>&1
done
--- skimage-0.9.3/debian/tests/python3 2014-01-23 21:07:58.000000000 +0100
+++ skimage-0.10.1/debian/tests/python3 2014-08-24 15:23:20.000000000 +0200
@@ -15,5 +15,5 @@
cd "$ADTTMP"
fi
- python$py /usr/bin/nosetests3 -s -v skimage 2>&1
+ xvfb-run -apython$py /usr/bin/nosetests3 -s -v skimage 2>&1
done
