diff --git a/debian/changelog b/debian/changelog index 8f15e45f..fd1fe056 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,5 @@ -scikits-image (0.3.0-1) UNRELEASED; urgency=low +scikits-image (0.5.0-1) UNRELEASED; urgency=low * Initial release. (Closes: #639820) - -- Stefan van der Walt Mon, 26 Sep 2011 23:52:45 -0700 + -- Stefan van der Walt Fri, 03 Feb 2012 20:45:51 -0700 diff --git a/debian/control b/debian/control index 38765d3a..27a50d7f 100644 --- a/debian/control +++ b/debian/control @@ -1,4 +1,4 @@ -Source: scikits-image +Source: skimage Section: python Priority: optional Maintainer: Stefan van der Walt @@ -7,35 +7,35 @@ Build-Depends: debhelper (>= 7.0.50), python-all-dev (>= 2.6.6-3~), python-numpy Standards-Version: 3.9.2 XS-Python-Version: >= 2.5 Homepage: http://scikits-image.org -Vcs-Browser: https://github.com/scikits-image/scikits.image -Vcs-Git: git://github.com/scikits-image/scikits.image.git +Vcs-Browser: https://github.com/scikits-image/scikits-image +Vcs-Git: git://github.com/scikits-image/scikits-image.git -Package: python-scikits.image +Package: python-skimage Architecture: all -Depends: ${misc:Depends}, ${python:Depends}, python-numpy, python-scipy, python-scikits.image-lib (>= ${source:Version}) +Depends: ${misc:Depends}, ${python:Depends}, python-numpy, python-scipy, python-skimage-lib (>= ${source:Version}) Provides: ${python:Provides} Recommends: python-nose, python-matplotlib -Suggests: python-scikits.image-doc, python-opencv +Suggests: python-skimage-doc, python-opencv Description: Python modules for image processing scikits-image is a collection of image processing algorithms for Python. It performs tasks such as image loading, filtering, morphology, segmentation, color conversions, and transformations. -Package: python-scikits.image-doc +Package: python-skimage-doc Architecture: all Section: doc Depends: ${misc:Depends}, libjs-jquery -Suggests: python-scikits.image +Suggests: python-skimage Description: Documentation and examples for scikits-image This package contains documentation and example scripts for - python-scikits.image. + python-skimage. -Package: python-scikits.image-lib +Package: python-skimage-lib Architecture: any Depends: ${misc:Depends}, ${shlibs:Depends}, ${python:Depends}, python-numpy -Recommends: python-scikits.image +Recommends: python-skimage Provides: ${python:Provides} XB-Python-Version: ${python:Versions} Description: Optimized low-level algorithms for scikits-image - This is an add-on package for python-scikits.image. It provides + This is an add-on package for python-skimage. It provides optimized, low-level implementations of algorithms. diff --git a/debian/copyright b/debian/copyright index d53f35b9..3e4d955b 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,34 +1,35 @@ Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat -Upstream-Name: scikit-learn -Upstream-Source-Location: http://sourceforge.net/apps/trac/scikit-learn/wiki/SubversionRepo +Upstream-Name: scikits-image +Upstream-Source-Location: http://scikits-image.org Files: * -Copyright: Copyright (C) 2007 - 2010 Scikit-Learn Developers. +Copyright: Copyright (C) 2009 - 2012, the scikits-image team License: BSD-3 Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are met: + modification, are permitted provided that the following conditions are + met: . - a. Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - b. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - c. Neither the name of the Scikit-learn Developers nor the names of - its contributors may be used to endorse or promote products - derived from this software without specific prior written - permission. + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in + the documentation and/or other materials provided with the + distribution. + 3. Neither the name of skimage nor the names of its contributors may be + used to endorse or promote products derived from this software without + specific prior written permission. . - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR - ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH - DAMAGE. + THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, + INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING + IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE. Files: doc/sphinxext/docscrape.py doc/sphinxext/docscrape_sphinx.py doc/sphinxext/numpydoc.py Copyright: Copyright (C) 2008 Stefan van der Walt , Pauli Virtanen @@ -40,14 +41,14 @@ License: BSD the documentation and/or other materials provided with the distribution. -Files: doc/sphinxext/plot_directive.py +Files: doc/ext/plot_directive.py Copyright: Copyright (c) 2002-2008 John D. Hunter License: PSF 1. This LICENSE AGREEMENT is between John D. Hunter (“JDH”), and the Individual or Organization (“Licensee”) accessing and otherwise using matplotlib software in source or binary form and its associated documentation. - + . 2. Subject to the terms and conditions of this License Agreement, JDH hereby grants Licensee a nonexclusive, royalty-free, world-wide license to reproduce, analyze, test, perform and/or display @@ -57,45 +58,36 @@ License: PSF i.e., “Copyright (c) 2002-2008 John D. Hunter; All Rights Reserved” are retained in matplotlib 0.98.3 alone or in any derivative version prepared by Licensee. - + . 3. In the event Licensee prepares a derivative work that is based on or incorporates matplotlib 0.98.3 or any part thereof, and wants to make the derivative work available to others as provided herein, then Licensee hereby agrees to include in any such work a brief summary of the changes made to matplotlib 0.98.3. - + . 4. JDH is making matplotlib 0.98.3 available to Licensee on an “AS IS” basis. JDH MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, JDH MAKES NO AND DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF MATPLOTLIB 0.98.3 WILL NOT INFRINGE ANY THIRD PARTY RIGHTS. - + . 5. JDH SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF MATPLOTLIB 0.98.3 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING MATPLOTLIB 0.98.3, OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF. - + . 6. This License Agreement will automatically terminate upon a material breach of its terms and conditions. - + . 7. Nothing in this License Agreement shall be deemed to create any relationship of agency, partnership, or joint venture between JDH and Licensee. This License Agreement does not grant permission to use JDH trademarks or trade name in a trademark sense to endorse or promote products or services of Licensee, or any third party. - + . 8. By copying, installing or otherwise using matplotlib 0.98.3, Licensee agrees to be bound by the terms and conditions of this License Agreement. -Files: ./scikits/learn/src/ -Copyright: Copyright (c) 2000-2009 Chih-Chung Chang and Chih-Jen Lin -License: BSD-3 - The source tarball contains a partial copy of the LIBSVM package. However, - the corresponding library is available from the libsvm source package (or - rather the binary packages it builds). Therefore this code is not used and - the respective packages are used as dependencies. This copy of the libsvm - code is, however, left in place, as it does not hurt and does not justify - repackaging of the upstream sources. diff --git a/debian/python-scikits.image-doc.links b/debian/python-skimage-doc.links similarity index 100% rename from debian/python-scikits.image-doc.links rename to debian/python-skimage-doc.links diff --git a/debian/python-scikits.image-doc.lintian-overrides b/debian/python-skimage-doc.lintian-overrides similarity index 100% rename from debian/python-scikits.image-doc.lintian-overrides rename to debian/python-skimage-doc.lintian-overrides