From 278d1324eab1a0048eb85755e25494e7c148e9ed Mon Sep 17 00:00:00 2001 From: Stefan van der Walt Date: Tue, 27 Sep 2011 00:48:04 -0700 Subject: [PATCH 01/27] PKG: Add first Debian packaging files. --- debian/changelog | 5 +++ debian/compat | 1 + debian/control | 41 +++++++++++++++++++ debian/copyright | 101 +++++++++++++++++++++++++++++++++++++++++++++++ debian/rules | 64 ++++++++++++++++++++++++++++++ debian/watch | 2 + 6 files changed, 214 insertions(+) create mode 100644 debian/changelog create mode 100644 debian/compat create mode 100644 debian/control create mode 100644 debian/copyright create mode 100755 debian/rules create mode 100644 debian/watch diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 00000000..3959afa7 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,5 @@ +scikits-image (0.3.0) UNRELEASED; urgency=low + + * Initial release. (Closes: #639820) + + -- Stefan van der Walt Mon, 26 Sep 2011 23:52:45 -0700 diff --git a/debian/compat b/debian/compat new file mode 100644 index 00000000..45a4fb75 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +8 diff --git a/debian/control b/debian/control new file mode 100644 index 00000000..ca5aa2bb --- /dev/null +++ b/debian/control @@ -0,0 +1,41 @@ +Source: scikits-image +Section: python +Priority: optional +Maintainer: Stefan van der Walt +Build-Depends: debhelper (>= 7.0.50), python-all-dev (>= 2.5), python-support (>= 0.6), python-numpy, python-sphinx, python-nose, python-setuptools, cython, python-matplotlib +Standards-Version: 3.9.1 +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 +XS-DM-Upload-Allowed: yes + +Package: python-scikits-image +Architecture: all +Depends: ${misc:Depends}, ${python:Depends}, python-numpy, python-scipy, python-scikits-image-lib(>= ${source:Version}) +Provides: ${python:Provides} +XB-Python-Version: ${python:Versions} +Recommends: python-nose, python-matplotlib +Suggests: python-scikits-image-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 +Architecture: all +Section: doc +Depends: ${misc:Depends}, libjs-jquery +Suggests: python-scikits-image +Description: Documentation and examples for scikits-image + This package contains documentation and example scripts for + python-scikits-image. + +Package: python-scikits-image-lib +Architecture: any +Depends: ${misc:Depends}, ${shlibs:Depends}, ${python:Depends}, python-numpy +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 + optimized, low-level implementations of algorithms. diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 00000000..d53f35b9 --- /dev/null +++ b/debian/copyright @@ -0,0 +1,101 @@ +Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat +Upstream-Name: scikit-learn +Upstream-Source-Location: http://sourceforge.net/apps/trac/scikit-learn/wiki/SubversionRepo + +Files: * +Copyright: Copyright (C) 2007 - 2010 Scikit-Learn Developers. +License: BSD-3 + Redistribution and use in source and binary forms, with or without + 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. + . + 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. + +Files: doc/sphinxext/docscrape.py doc/sphinxext/docscrape_sphinx.py doc/sphinxext/numpydoc.py +Copyright: Copyright (C) 2008 Stefan van der Walt , Pauli Virtanen +License: BSD + 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. + +Files: doc/sphinxext/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 + publicly, prepare derivative works, distribute, and otherwise use + matplotlib 0.98.3 alone or in any derivative version, provided, + however, that JDH’s License Agreement and JDH’s notice of copyright, + 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/rules b/debian/rules new file mode 100755 index 00000000..092b3c3b --- /dev/null +++ b/debian/rules @@ -0,0 +1,64 @@ +#!/usr/bin/make -f +# -*- mode: makefile; coding: utf-8 -*- + +PACKAGE_NAME = python-scikits-image +PACKAGE_ROOT_DIR = debian/${PACKAGE_NAME} + +PYVERS = $(shell pyversions -vs) +PYVER = $(shell pyversions -vd) + +# Mega rule +%: + dh $@ + +# Build docs during build +override_dh_auto_build: + dh_auto_build + : # Build Documentation +ifeq (,$(filter nodoc,$(DEB_BUILD_OPTIONS))) + export PYTHONPATH=`/bin/ls -d $$PWD/build/lib.*$(PYVER)` MPLCONFIGDIR=$(CURDIR)/build HOME=$(CURDIR)/build; \ + cd doc; $(MAKE) html +endif + + +override_dh_clean: + rm -rf build doc/build doc/auto_examples *-stamp scikits.image.egg-info + dh_clean + +# Prune toplevel scikits/__init__.py to avoid conflicts across future +# scikits- packages, and rely on pysupport to create such one if +# necessary +override_dh_auto_install: ${PYVERS:%=python-install%} + find debian -wholename \*scikits/__init__.py -delete + +# Per Python version logic -- install, test, move .so into -lib +python-install%: + python$* setup.py install --install-layout=deb --root=$(PACKAGE_ROOT_DIR) + +ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) + : # Run unittests + export MPLCONFIGDIR=$(CURDIR)/build HOME=$(CURDIR)/build; \ + python$* /usr/bin/nosetests -s \ + $(PACKAGE_ROOT_DIR)/usr/lib/python$*/*/scikits/image +else + : # Skip unittests due to nocheck +endif + + : # Move platform-specific libraries into -lib + for lib in $$(find $(PACKAGE_ROOT_DIR)/usr -name '*.so'); do \ + sdir=$$(dirname $$lib) ; \ + tdir=$(PACKAGE_ROOT_DIR)-lib/$${sdir#*$(PACKAGE_NAME)/} ; \ + mkdir -p $$tdir ; \ + echo "Moving '$$lib' into '$$tdir'." ; \ + mv $$lib $$tdir ; \ + done + if [ -x /usr/bin/dh_numpy ]; then dh_numpy; fi + +## immediately useable documentation and exemplar scripts/data +override_dh_compress: + dh_compress -X.py -X.html -X.pdf -X.css -X.jpg -X.txt -X.js -X.json -X.rtc + +override_dh_installdocs: + : # Use jquery from Debian package, so prune shipped one + -rm doc/build/html/_static/jquery.js + dh_installdocs -A CONTRIBUTORS.txt DEVELOPMENT.txt README.txt TASKS.txt diff --git a/debian/watch b/debian/watch new file mode 100644 index 00000000..329bae43 --- /dev/null +++ b/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://github.com/scikits-image/scikits.image/downloads .*tarball/v([\d\.a-z]+) From 09b700c2dc5da2638fcb848ad841b1aec9ad1c06 Mon Sep 17 00:00:00 2001 From: Stefan van der Walt Date: Tue, 27 Sep 2011 23:01:09 -0700 Subject: [PATCH 02/27] PKG: Depend on Cython >= 0.13. --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index ca5aa2bb..f4538f96 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: scikits-image Section: python Priority: optional Maintainer: Stefan van der Walt -Build-Depends: debhelper (>= 7.0.50), python-all-dev (>= 2.5), python-support (>= 0.6), python-numpy, python-sphinx, python-nose, python-setuptools, cython, python-matplotlib +Build-Depends: debhelper (>= 7.0.50), python-all-dev (>= 2.5), python-support (>= 0.6), python-numpy, python-sphinx, python-nose, python-setuptools, cython (>= 0.13), python-matplotlib Standards-Version: 3.9.1 XS-Python-Version: >= 2.5 Homepage: http://scikits-image.org From a2d8d432af66933cd300069b42680054b3d30c38 Mon Sep 17 00:00:00 2001 From: Stefan van der Walt Date: Wed, 28 Sep 2011 01:39:25 -0700 Subject: [PATCH 03/27] PKG: Use dh_python instead of py_support to build. Add 'noclean' build option. --- debian/control | 3 +-- debian/rules | 6 ++++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/debian/control b/debian/control index f4538f96..6d8768db 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: scikits-image Section: python Priority: optional Maintainer: Stefan van der Walt -Build-Depends: debhelper (>= 7.0.50), python-all-dev (>= 2.5), python-support (>= 0.6), python-numpy, python-sphinx, python-nose, python-setuptools, cython (>= 0.13), python-matplotlib +Build-Depends: debhelper (>= 7.0.50), python-all-dev (>= 2.6.6-3~), python-numpy, python-sphinx, python-nose, python-setuptools, cython (>= 0.13), python-matplotlib Standards-Version: 3.9.1 XS-Python-Version: >= 2.5 Homepage: http://scikits-image.org @@ -14,7 +14,6 @@ Package: python-scikits-image Architecture: all Depends: ${misc:Depends}, ${python:Depends}, python-numpy, python-scipy, python-scikits-image-lib(>= ${source:Version}) Provides: ${python:Provides} -XB-Python-Version: ${python:Versions} Recommends: python-nose, python-matplotlib Suggests: python-scikits-image-doc, python-opencv Description: Python modules for image processing diff --git a/debian/rules b/debian/rules index 092b3c3b..727c3ebd 100755 --- a/debian/rules +++ b/debian/rules @@ -9,7 +9,7 @@ PYVER = $(shell pyversions -vd) # Mega rule %: - dh $@ + dh $@ --buildsystem python_distutils # Build docs during build override_dh_auto_build: @@ -22,11 +22,13 @@ endif override_dh_clean: +ifeq (,$(filter noclean,$(DEB_BUILD_OPTIONS))) rm -rf build doc/build doc/auto_examples *-stamp scikits.image.egg-info dh_clean +endif # Prune toplevel scikits/__init__.py to avoid conflicts across future -# scikits- packages, and rely on pysupport to create such one if +# scikits- packages, and rely on dh_python to create such one if # necessary override_dh_auto_install: ${PYVERS:%=python-install%} find debian -wholename \*scikits/__init__.py -delete From 7ab059717c625d90a3ec9546eeaf26f4ac649329 Mon Sep 17 00:00:00 2001 From: Stefan van der Walt Date: Wed, 28 Sep 2011 02:33:03 -0700 Subject: [PATCH 04/27] PKG: Progress towards doc building. --- debian/rules | 33 +++++++++++++++++++++------------ 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/debian/rules b/debian/rules index 727c3ebd..06ed86a4 100755 --- a/debian/rules +++ b/debian/rules @@ -11,16 +11,6 @@ PYVER = $(shell pyversions -vd) %: dh $@ --buildsystem python_distutils -# Build docs during build -override_dh_auto_build: - dh_auto_build - : # Build Documentation -ifeq (,$(filter nodoc,$(DEB_BUILD_OPTIONS))) - export PYTHONPATH=`/bin/ls -d $$PWD/build/lib.*$(PYVER)` MPLCONFIGDIR=$(CURDIR)/build HOME=$(CURDIR)/build; \ - cd doc; $(MAKE) html -endif - - override_dh_clean: ifeq (,$(filter noclean,$(DEB_BUILD_OPTIONS))) rm -rf build doc/build doc/auto_examples *-stamp scikits.image.egg-info @@ -30,6 +20,8 @@ endif # Prune toplevel scikits/__init__.py to avoid conflicts across future # scikits- packages, and rely on dh_python to create such one if # necessary + +# Build docs during install override_dh_auto_install: ${PYVERS:%=python-install%} find debian -wholename \*scikits/__init__.py -delete @@ -37,9 +29,16 @@ override_dh_auto_install: ${PYVERS:%=python-install%} python-install%: python$* setup.py install --install-layout=deb --root=$(PACKAGE_ROOT_DIR) + : # Build Documentation +ifeq (,$(filter nodoc,$(DEB_BUILD_OPTIONS))) + export PYTHONPATH=$(PACKAGE_ROOT_DIR)/usr/lib/python$*/dist-packages MPLCONFIGDIR=$(CURDIR)/build HOME=$(CURDIR)/build; \ + cd doc; $(MAKE) html + python$* setup.py install --install-layout=deb --root=$(PACKAGE_ROOT_DIR) +endif + ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) : # Run unittests - export MPLCONFIGDIR=$(CURDIR)/build HOME=$(CURDIR)/build; \ + export PYTHONPATH=$(PACKAGE_ROOT_DIR)/usr/lib/python$*/dist-packages; \ python$* /usr/bin/nosetests -s \ $(PACKAGE_ROOT_DIR)/usr/lib/python$*/*/scikits/image else @@ -54,6 +53,16 @@ endif echo "Moving '$$lib' into '$$tdir'." ; \ mv $$lib $$tdir ; \ done + + : # Move documentation to -doc + for lib in $$(find $(PACKAGE_ROOT_DIR)/usr -name '*.so'); do \ + sdir=$(CURDIR)/build/html ; \ + tdir=$(PACKAGE_ROOT_DIR)-doc/} ; \ + mkdir -p $$tdir ; \ + echo "Moving '$$sdir' into '$$tdir'." ; \ + mv $$lib $$tdir ; \ + done + if [ -x /usr/bin/dh_numpy ]; then dh_numpy; fi ## immediately useable documentation and exemplar scripts/data @@ -62,5 +71,5 @@ override_dh_compress: override_dh_installdocs: : # Use jquery from Debian package, so prune shipped one - -rm doc/build/html/_static/jquery.js + -rm -f doc/build/html/_static/jquery.js dh_installdocs -A CONTRIBUTORS.txt DEVELOPMENT.txt README.txt TASKS.txt From 4f853c71aeb32a65019b940058e1db47bcba7d82 Mon Sep 17 00:00:00 2001 From: Stefan van der Walt Date: Wed, 28 Sep 2011 21:24:56 -0700 Subject: [PATCH 05/27] PKG: Working Debian package. --- debian/rules | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/debian/rules b/debian/rules index 06ed86a4..70882400 100755 --- a/debian/rules +++ b/debian/rules @@ -2,7 +2,7 @@ # -*- mode: makefile; coding: utf-8 -*- PACKAGE_NAME = python-scikits-image -PACKAGE_ROOT_DIR = debian/${PACKAGE_NAME} +PACKAGE_ROOT_DIR = $(CURDIR)/debian/${PACKAGE_NAME} PYVERS = $(shell pyversions -vs) PYVER = $(shell pyversions -vd) @@ -32,7 +32,7 @@ python-install%: : # Build Documentation ifeq (,$(filter nodoc,$(DEB_BUILD_OPTIONS))) export PYTHONPATH=$(PACKAGE_ROOT_DIR)/usr/lib/python$*/dist-packages MPLCONFIGDIR=$(CURDIR)/build HOME=$(CURDIR)/build; \ - cd doc; $(MAKE) html + cd doc; test -d build/html || $(MAKE) html python$* setup.py install --install-layout=deb --root=$(PACKAGE_ROOT_DIR) endif @@ -54,14 +54,17 @@ endif mv $$lib $$tdir ; \ done + : # Use jquery from Debian package, so prune shipped one + -rm -f doc/build/html/_static/jquery.js + -rf -f doc/build/html/_sources + -rf -f doc/build/html/.buildinfo + : # Move documentation to -doc - for lib in $$(find $(PACKAGE_ROOT_DIR)/usr -name '*.so'); do \ - sdir=$(CURDIR)/build/html ; \ - tdir=$(PACKAGE_ROOT_DIR)-doc/} ; \ - mkdir -p $$tdir ; \ - echo "Moving '$$sdir' into '$$tdir'." ; \ - mv $$lib $$tdir ; \ - done + sdir=$(CURDIR)/doc/build/html ; \ + tdir=$(PACKAGE_ROOT_DIR)-doc/usr/share/doc/$(PACKAGE_NAME)-doc ; \ + mkdir -p $$tdir ; \ + echo "DOCS: Moving '$$sdir' into '$$tdir'." ; \ + test -d $$tdir/html || mv $$sdir $$tdir if [ -x /usr/bin/dh_numpy ]; then dh_numpy; fi @@ -70,6 +73,7 @@ override_dh_compress: dh_compress -X.py -X.html -X.pdf -X.css -X.jpg -X.txt -X.js -X.json -X.rtc override_dh_installdocs: - : # Use jquery from Debian package, so prune shipped one - -rm -f doc/build/html/_static/jquery.js - dh_installdocs -A CONTRIBUTORS.txt DEVELOPMENT.txt README.txt TASKS.txt + dh_installdocs -A CONTRIBUTORS.txt README.txt + dh_link /usr/share/javascript/jquery/jquery.js \ + /usr/share/doc/$(PACKAGE_NAME)-doc/html/_static/jquery.js + cp DEVELOPMENT.txt TASKS.txt $(PACKAGE_ROOT_DIR)/usr/share/doc/ From e1c9dec8af6814d477fd252283d8b5f6a7c43f1d Mon Sep 17 00:00:00 2001 From: Yaroslav Halchenko Date: Fri, 30 Sep 2011 00:13:26 -0400 Subject: [PATCH 06/27] PKG: Let's stay at slightly lower level of debhelper compatibility Would allow us to avoid surprises and warnings while building backports for Debian/Ubuntu releases which have only 7.x series of debhelper --- debian/compat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/compat b/debian/compat index 45a4fb75..7f8f011e 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -8 +7 From 9a4faee939da57dd6b4adbc6a7ee5730424e404c Mon Sep 17 00:00:00 2001 From: Yaroslav Halchenko Date: Fri, 30 Sep 2011 00:12:00 -0400 Subject: [PATCH 07/27] PKG: let's use 3.0 (quilt) format for the pkg having a quilt patch queue enabled simplifies in the long run the maintenance and makes it easy to see what changes to upstream might have been needed to fit Debian better --- debian/source/format | 1 + 1 file changed, 1 insertion(+) create mode 100644 debian/source/format diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 00000000..163aaf8d --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) From 330ae064cfdade1b84a90c29710875373e43cbab Mon Sep 17 00:00:00 2001 From: Yaroslav Halchenko Date: Fri, 30 Sep 2011 00:08:01 -0400 Subject: [PATCH 08/27] PKG: must be a non-Debian-native version, so added -1 for Debian revision --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 3959afa7..8f15e45f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -scikits-image (0.3.0) UNRELEASED; urgency=low +scikits-image (0.3.0-1) UNRELEASED; urgency=low * Initial release. (Closes: #639820) From 9fc9a7b86edd775ee621858dbc7f243bd115a7f1 Mon Sep 17 00:00:00 2001 From: Yaroslav Halchenko Date: Thu, 29 Sep 2011 23:38:12 -0400 Subject: [PATCH 09/27] PKG: pkg should match the module name (hence python-scikits.image) + Uploaders (me) --- debian/control | 19 ++++++++++--------- debian/rules | 2 +- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/debian/control b/debian/control index 6d8768db..6404be66 100644 --- a/debian/control +++ b/debian/control @@ -2,39 +2,40 @@ Source: scikits-image Section: python Priority: optional Maintainer: Stefan van der Walt +Uploaders: Yaroslav Halchenko Build-Depends: debhelper (>= 7.0.50), python-all-dev (>= 2.6.6-3~), python-numpy, python-sphinx, python-nose, python-setuptools, cython (>= 0.13), python-matplotlib Standards-Version: 3.9.1 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 -XS-DM-Upload-Allowed: yes -Package: python-scikits-image +Package: python-scikits.image 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-scikits.image-lib (>= ${source:Version}) Provides: ${python:Provides} Recommends: python-nose, python-matplotlib -Suggests: python-scikits-image-doc, python-opencv +Suggests: python-scikits.image-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-scikits.image-doc Architecture: all Section: doc Depends: ${misc:Depends}, libjs-jquery -Suggests: python-scikits-image +Suggests: python-scikits.image Description: Documentation and examples for scikits-image This package contains documentation and example scripts for - python-scikits-image. + python-scikits.image. -Package: python-scikits-image-lib +Package: python-scikits.image-lib Architecture: any Depends: ${misc:Depends}, ${shlibs:Depends}, ${python:Depends}, python-numpy +Recommends: python-scikits.image 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-scikits.image. It provides optimized, low-level implementations of algorithms. diff --git a/debian/rules b/debian/rules index 70882400..fa4fbd3e 100755 --- a/debian/rules +++ b/debian/rules @@ -1,7 +1,7 @@ #!/usr/bin/make -f # -*- mode: makefile; coding: utf-8 -*- -PACKAGE_NAME = python-scikits-image +PACKAGE_NAME = python-scikits.image PACKAGE_ROOT_DIR = $(CURDIR)/debian/${PACKAGE_NAME} PYVERS = $(shell pyversions -vs) From d4e02e677cdc7e294e71b36e1fe742b97a51feda Mon Sep 17 00:00:00 2001 From: Yaroslav Halchenko Date: Thu, 29 Sep 2011 23:36:10 -0400 Subject: [PATCH 10/27] PKG: mangle the name of the downloaded tarball from github otherwise it is just v0.2.1 --- debian/watch | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/watch b/debian/watch index 329bae43..9dd1446b 100644 --- a/debian/watch +++ b/debian/watch @@ -1,2 +1,3 @@ version=3 -http://github.com/scikits-image/scikits.image/downloads .*tarball/v([\d\.a-z]+) +options="uversionmangle=s/v//,filenamemangle=s/.*\/(.*)/scikits-image-$1\.tar\.gz/" \ + http://github.com/scikits-image/scikits.image/downloads .*tarball/v([\d\.a-z]+) From a6d964f3d7a33eb2b7f9e5c7a527f2bb9d4fd842 Mon Sep 17 00:00:00 2001 From: Stefan van der Walt Date: Mon, 3 Oct 2011 09:01:32 -0700 Subject: [PATCH 11/27] PKG: Add scipy build dependency (when the API is built, scipy is imported by some packages). --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 6404be66..e314a35c 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: python Priority: optional Maintainer: Stefan van der Walt Uploaders: Yaroslav Halchenko -Build-Depends: debhelper (>= 7.0.50), python-all-dev (>= 2.6.6-3~), python-numpy, python-sphinx, python-nose, python-setuptools, cython (>= 0.13), python-matplotlib +Build-Depends: debhelper (>= 7.0.50), python-all-dev (>= 2.6.6-3~), python-numpy, python-sphinx, python-nose, python-setuptools, cython (>= 0.13), python-matplotlib, python-scipy Standards-Version: 3.9.1 XS-Python-Version: >= 2.5 Homepage: http://scikits-image.org From 4957834fee0e4d24e3ca7876ea56e18720a79b54 Mon Sep 17 00:00:00 2001 From: Yaroslav Halchenko Date: Tue, 4 Oct 2011 09:31:25 -0400 Subject: [PATCH 12/27] PKG: Use dh_installdocs to install additional docs instead of incorrect cp --- debian/rules | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/debian/rules b/debian/rules index fa4fbd3e..f1b57a41 100755 --- a/debian/rules +++ b/debian/rules @@ -73,7 +73,6 @@ override_dh_compress: dh_compress -X.py -X.html -X.pdf -X.css -X.jpg -X.txt -X.js -X.json -X.rtc override_dh_installdocs: - dh_installdocs -A CONTRIBUTORS.txt README.txt + dh_installdocs -A CONTRIBUTORS.txt README.txt DEVELOPMENT.txt TASKS.txt dh_link /usr/share/javascript/jquery/jquery.js \ /usr/share/doc/$(PACKAGE_NAME)-doc/html/_static/jquery.js - cp DEVELOPMENT.txt TASKS.txt $(PACKAGE_ROOT_DIR)/usr/share/doc/ From 21f4391e6c83c559a41b73185f8d1671719e6e7d Mon Sep 17 00:00:00 2001 From: Yaroslav Halchenko Date: Tue, 4 Oct 2011 09:49:09 -0400 Subject: [PATCH 13/27] PKG: lintian-override for -doc to ship the license.txt --- debian/python-scikits.image-doc.lintian-overrides | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 debian/python-scikits.image-doc.lintian-overrides diff --git a/debian/python-scikits.image-doc.lintian-overrides b/debian/python-scikits.image-doc.lintian-overrides new file mode 100644 index 00000000..3e9a4b32 --- /dev/null +++ b/debian/python-scikits.image-doc.lintian-overrides @@ -0,0 +1,4 @@ +# Explicit license file is desired for the completeness of the documentation +# + +python-scikits.image-doc binary: extra-license-file usr/share/doc/python-scikits.image-doc/html/_sources/license.txt From 4db1b8fcac2fd819c6202cbfac8666b4a8e2014b Mon Sep 17 00:00:00 2001 From: Yaroslav Halchenko Date: Tue, 4 Oct 2011 09:40:48 -0400 Subject: [PATCH 14/27] PKG: use dh_links (with links specified in .links) to use system-wide installed jquery and underscore --- debian/control | 2 +- debian/python-scikits.image-doc.links | 2 ++ debian/rules | 5 ++--- 3 files changed, 5 insertions(+), 4 deletions(-) create mode 100644 debian/python-scikits.image-doc.links diff --git a/debian/control b/debian/control index e314a35c..2210e798 100644 --- a/debian/control +++ b/debian/control @@ -24,7 +24,7 @@ Description: Python modules for image processing Package: python-scikits.image-doc Architecture: all Section: doc -Depends: ${misc:Depends}, libjs-jquery +Depends: ${misc:Depends}, libjs-jquery, libjs-underscore Suggests: python-scikits.image Description: Documentation and examples for scikits-image This package contains documentation and example scripts for diff --git a/debian/python-scikits.image-doc.links b/debian/python-scikits.image-doc.links new file mode 100644 index 00000000..7e9acc12 --- /dev/null +++ b/debian/python-scikits.image-doc.links @@ -0,0 +1,2 @@ +usr/share/javascript/jquery/jquery.js usr/share/doc/python-scikits.statsmodels-doc/html/_static/jquery.js +usr/share/javascript/underscore/underscore.js usr/share/doc/python-scikits.statsmodels-doc/html/_static/underscore.js diff --git a/debian/rules b/debian/rules index f1b57a41..bb121983 100755 --- a/debian/rules +++ b/debian/rules @@ -54,8 +54,9 @@ endif mv $$lib $$tdir ; \ done - : # Use jquery from Debian package, so prune shipped one + : # Use jquery and underscore from Debian package, so prune shipped one -rm -f doc/build/html/_static/jquery.js + -rm -f doc/build/html/_static/underscore.js -rf -f doc/build/html/_sources -rf -f doc/build/html/.buildinfo @@ -74,5 +75,3 @@ override_dh_compress: override_dh_installdocs: dh_installdocs -A CONTRIBUTORS.txt README.txt DEVELOPMENT.txt TASKS.txt - dh_link /usr/share/javascript/jquery/jquery.js \ - /usr/share/doc/$(PACKAGE_NAME)-doc/html/_static/jquery.js From f49c3313b6cfec11d7817f37597492a70ea0582f Mon Sep 17 00:00:00 2001 From: Yaroslav Halchenko Date: Tue, 4 Oct 2011 09:52:03 -0400 Subject: [PATCH 15/27] PKG: do not use system-wide underscore.js for now --- debian/control | 2 +- debian/python-scikits.image-doc.links | 1 - debian/python-scikits.image-doc.lintian-overrides | 5 +++++ debian/rules | 3 ++- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/debian/control b/debian/control index 2210e798..e314a35c 100644 --- a/debian/control +++ b/debian/control @@ -24,7 +24,7 @@ Description: Python modules for image processing Package: python-scikits.image-doc Architecture: all Section: doc -Depends: ${misc:Depends}, libjs-jquery, libjs-underscore +Depends: ${misc:Depends}, libjs-jquery Suggests: python-scikits.image Description: Documentation and examples for scikits-image This package contains documentation and example scripts for diff --git a/debian/python-scikits.image-doc.links b/debian/python-scikits.image-doc.links index 7e9acc12..6e8db971 100644 --- a/debian/python-scikits.image-doc.links +++ b/debian/python-scikits.image-doc.links @@ -1,2 +1 @@ usr/share/javascript/jquery/jquery.js usr/share/doc/python-scikits.statsmodels-doc/html/_static/jquery.js -usr/share/javascript/underscore/underscore.js usr/share/doc/python-scikits.statsmodels-doc/html/_static/underscore.js diff --git a/debian/python-scikits.image-doc.lintian-overrides b/debian/python-scikits.image-doc.lintian-overrides index 3e9a4b32..9a6b07d5 100644 --- a/debian/python-scikits.image-doc.lintian-overrides +++ b/debian/python-scikits.image-doc.lintian-overrides @@ -2,3 +2,8 @@ # python-scikits.image-doc binary: extra-license-file usr/share/doc/python-scikits.image-doc/html/_sources/license.txt + +# For easy backportability just rely on the shipped copy of underscore.js for now until problems with nodejs get resolved +# + +python-scikits.image-doc binary: embedded-javascript-library usr/share/doc/python-scikits.image-doc/html/_static/underscore.js diff --git a/debian/rules b/debian/rules index bb121983..6db21fa1 100755 --- a/debian/rules +++ b/debian/rules @@ -56,7 +56,8 @@ endif : # Use jquery and underscore from Debian package, so prune shipped one -rm -f doc/build/html/_static/jquery.js - -rm -f doc/build/html/_static/underscore.js + # Actually due to the problems with underscore pkg across releases just ship one for now + #-rm -f doc/build/html/_static/underscore.js -rf -f doc/build/html/_sources -rf -f doc/build/html/.buildinfo From 081808d0e5e8a35b10d71db5e5e6781c039e86f6 Mon Sep 17 00:00:00 2001 From: Yaroslav Halchenko Date: Tue, 4 Oct 2011 09:56:19 -0400 Subject: [PATCH 16/27] PKG: ignore changes in version.py while preparing source package --- debian/source/options | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 debian/source/options diff --git a/debian/source/options b/debian/source/options new file mode 100644 index 00000000..fcd9d4f9 --- /dev/null +++ b/debian/source/options @@ -0,0 +1,2 @@ +# Do not generate diff for version.py which gets updated by setup.py +extend-diff-ignore = "(^|/)scikits/image/version.py$" From 1681001c64f246f060911c5508b6db6ec775ed37 Mon Sep 17 00:00:00 2001 From: Yaroslav Halchenko Date: Tue, 4 Oct 2011 09:59:54 -0400 Subject: [PATCH 17/27] PKG: Boosted standards policy compliance to 3.9.2 (no changes needed iirc) --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index e314a35c..38765d3a 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Stefan van der Walt Uploaders: Yaroslav Halchenko Build-Depends: debhelper (>= 7.0.50), python-all-dev (>= 2.6.6-3~), python-numpy, python-sphinx, python-nose, python-setuptools, cython (>= 0.13), python-matplotlib, python-scipy -Standards-Version: 3.9.1 +Standards-Version: 3.9.2 XS-Python-Version: >= 2.5 Homepage: http://scikits-image.org Vcs-Browser: https://github.com/scikits-image/scikits.image From 0fe0238df329745bd32e66c94c0f472564a0cc8b Mon Sep 17 00:00:00 2001 From: Stefan van der Walt Date: Fri, 3 Feb 2012 20:54:03 -0800 Subject: [PATCH 18/27] PKG: Bring Debian package files up to date with 0.5. --- debian/changelog | 4 +- debian/control | 24 +++--- debian/copyright | 74 +++++++++---------- ...age-doc.links => python-skimage-doc.links} | 0 ...s => python-skimage-doc.lintian-overrides} | 0 5 files changed, 47 insertions(+), 55 deletions(-) rename debian/{python-scikits.image-doc.links => python-skimage-doc.links} (100%) rename debian/{python-scikits.image-doc.lintian-overrides => python-skimage-doc.lintian-overrides} (100%) 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 From 7f5a18ea63975dd54a577e9c14bd853eb53cf767 Mon Sep 17 00:00:00 2001 From: Stefan van der Walt Date: Fri, 3 Feb 2012 21:14:24 -0800 Subject: [PATCH 19/27] PKG: Fix timestamp timezone. --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index fd1fe056..52f21b37 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,4 +2,4 @@ scikits-image (0.5.0-1) UNRELEASED; urgency=low * Initial release. (Closes: #639820) - -- Stefan van der Walt Fri, 03 Feb 2012 20:45:51 -0700 + -- Stefan van der Walt Fri, 03 Feb 2012 20:45:51 -0800 From 8f140f9f6f5a96699b47d94ed7accc7994a4c806 Mon Sep 17 00:00:00 2001 From: Stefan van der Walt Date: Fri, 3 Feb 2012 21:14:33 -0800 Subject: [PATCH 20/27] PKG: Add template for skivi man page. --- debian/skivi.1 | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) create mode 100644 debian/skivi.1 diff --git a/debian/skivi.1 b/debian/skivi.1 new file mode 100644 index 00000000..a3103516 --- /dev/null +++ b/debian/skivi.1 @@ -0,0 +1,59 @@ +.\" Hey, EMACS: -*- nroff -*- +.\" First parameter, NAME, should be all caps +.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection +.\" other parameters are allowed: see man(7), man(1) +.TH SKIMAGE SECTION "February 3, 2012" +.\" Please adjust this date whenever revising the manpage. +.\" +.\" Some roff macros, for reference: +.\" .nh disable hyphenation +.\" .hy enable hyphenation +.\" .ad l left justify +.\" .ad b justify to both left and right margins +.\" .nf disable filling +.\" .fi enable filling +.\" .br insert line break +.\" .sp insert n+1 empty lines +.\" for manpage-specific macros, see man(7) +.SH NAME +skivi \- image viewer based on scikits-image +.SH SYNOPSIS +.B skivi +.RI [ options ] " file" ... +.br +.B bar +.RI [ options ] " file" ... +.SH DESCRIPTION +This manual page documents briefly the +.B skimage +and +.B bar +commands. +.PP +.\" TeX users may be more comfortable with the \fB\fP and +.\" \fI\fP escape sequences to invode bold face and italics, +.\" respectively. +\fBskimage\fP is a program that... +.SH OPTIONS +These programs follow the usual GNU command line syntax, with long +options starting with two dashes (`-'). +A summary of options is included below. +For a complete description, see the Info files. +.TP +.B \-h, \-\-help +Show summary of options. +.TP +.B \-v, \-\-version +Show version of program. +.SH SEE ALSO +.BR bar (1), +.BR baz (1). +.br +The programs are documented fully by +.IR "The Rise and Fall of a Fooish Bar" , +available via the Info system. +.SH AUTHOR +skimage was written by . +.PP +This manual page was written by Stefan van der Walt , +for the Debian project (and may be used by others). From 930800025eb757fe80ab1d6471f0bb7fb2868f33 Mon Sep 17 00:00:00 2001 From: Yaroslav Halchenko Date: Tue, 24 Apr 2012 00:10:14 -0400 Subject: [PATCH 21/27] adjusting version to match git snapshot --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 52f21b37..98b16f08 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -scikits-image (0.5.0-1) UNRELEASED; urgency=low +scikits-image (0.5.0+git33-g6aa7d54-1) UNRELEASED; urgency=low * Initial release. (Closes: #639820) From b424a56ea5d228824f44c4a4c13c738abc2ff55c Mon Sep 17 00:00:00 2001 From: Yaroslav Halchenko Date: Tue, 24 Apr 2012 00:12:08 -0400 Subject: [PATCH 22/27] source name should match in changelog and control --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 98b16f08..2b79f82f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -scikits-image (0.5.0+git33-g6aa7d54-1) UNRELEASED; urgency=low +skimage (0.5.0+git33-g6aa7d54-1) UNRELEASED; urgency=low * Initial release. (Closes: #639820) From 146c5c9023c8e27608dbb3e96381746f6a7758d5 Mon Sep 17 00:00:00 2001 From: Yaroslav Halchenko Date: Tue, 24 Apr 2012 00:13:31 -0400 Subject: [PATCH 23/27] adjusted extend-diff-ignore to exclude skimage/version.py --- debian/source/options | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/source/options b/debian/source/options index fcd9d4f9..48ace0b3 100644 --- a/debian/source/options +++ b/debian/source/options @@ -1,2 +1,2 @@ # Do not generate diff for version.py which gets updated by setup.py -extend-diff-ignore = "(^|/)scikits/image/version.py$" +extend-diff-ignore = "(^|/)skimage/version.py$" From f695517af4cea0dd4ae9c54f3cbdfed6efaafb5d Mon Sep 17 00:00:00 2001 From: Yaroslav Halchenko Date: Tue, 24 Apr 2012 12:41:06 -0400 Subject: [PATCH 24/27] libfreeimage3 into *Depends --- debian/control | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/control b/debian/control index 27a50d7f..bf2f6ad0 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: python Priority: optional Maintainer: Stefan van der Walt Uploaders: Yaroslav Halchenko -Build-Depends: debhelper (>= 7.0.50), python-all-dev (>= 2.6.6-3~), python-numpy, python-sphinx, python-nose, python-setuptools, cython (>= 0.13), python-matplotlib, python-scipy +Build-Depends: debhelper (>= 7.0.50), python-all-dev (>= 2.6.6-3~), python-numpy, python-sphinx, python-nose, python-setuptools, cython (>= 0.13), python-matplotlib, python-scipy, libfreeimage3 Standards-Version: 3.9.2 XS-Python-Version: >= 2.5 Homepage: http://scikits-image.org @@ -12,7 +12,7 @@ Vcs-Git: git://github.com/scikits-image/scikits-image.git Package: python-skimage Architecture: all -Depends: ${misc:Depends}, ${python:Depends}, python-numpy, python-scipy, python-skimage-lib (>= ${source:Version}) +Depends: ${misc:Depends}, ${python:Depends}, python-numpy, python-scipy, python-skimage-lib (>= ${source:Version}), libfreeimage3 Provides: ${python:Provides} Recommends: python-nose, python-matplotlib Suggests: python-skimage-doc, python-opencv From adcc59efe95aaa77d167aade7ee3cbb2c8c737f5 Mon Sep 17 00:00:00 2001 From: Yaroslav Halchenko Date: Tue, 24 Apr 2012 12:41:51 -0400 Subject: [PATCH 25/27] removing residual of scikits.image in favor of skimage in debian/rules --- debian/rules | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/debian/rules b/debian/rules index 6db21fa1..cc81b15e 100755 --- a/debian/rules +++ b/debian/rules @@ -1,7 +1,7 @@ #!/usr/bin/make -f # -*- mode: makefile; coding: utf-8 -*- -PACKAGE_NAME = python-scikits.image +PACKAGE_NAME = python-skimage PACKAGE_ROOT_DIR = $(CURDIR)/debian/${PACKAGE_NAME} PYVERS = $(shell pyversions -vs) @@ -13,17 +13,12 @@ PYVER = $(shell pyversions -vd) override_dh_clean: ifeq (,$(filter noclean,$(DEB_BUILD_OPTIONS))) - rm -rf build doc/build doc/auto_examples *-stamp scikits.image.egg-info + rm -rf build doc/build doc/auto_examples *-stamp skimage.egg-info dh_clean endif -# Prune toplevel scikits/__init__.py to avoid conflicts across future -# scikits- packages, and rely on dh_python to create such one if -# necessary - # Build docs during install override_dh_auto_install: ${PYVERS:%=python-install%} - find debian -wholename \*scikits/__init__.py -delete # Per Python version logic -- install, test, move .so into -lib python-install%: @@ -40,7 +35,7 @@ ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) : # Run unittests export PYTHONPATH=$(PACKAGE_ROOT_DIR)/usr/lib/python$*/dist-packages; \ python$* /usr/bin/nosetests -s \ - $(PACKAGE_ROOT_DIR)/usr/lib/python$*/*/scikits/image + $(PACKAGE_ROOT_DIR)/usr/lib/python$*/*/skimage else : # Skip unittests due to nocheck endif From 2b91b1c0371b009ad66abfaa92e6bd38741d4340 Mon Sep 17 00:00:00 2001 From: Yaroslav Halchenko Date: Tue, 24 Apr 2012 12:50:57 -0400 Subject: [PATCH 26/27] python-imaging into Build-Depends and Recommends --- debian/control | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/control b/debian/control index bf2f6ad0..71700258 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: python Priority: optional Maintainer: Stefan van der Walt Uploaders: Yaroslav Halchenko -Build-Depends: debhelper (>= 7.0.50), python-all-dev (>= 2.6.6-3~), python-numpy, python-sphinx, python-nose, python-setuptools, cython (>= 0.13), python-matplotlib, python-scipy, libfreeimage3 +Build-Depends: debhelper (>= 7.0.50), python-all-dev (>= 2.6.6-3~), python-numpy, python-sphinx, python-nose, python-setuptools, cython (>= 0.13), python-matplotlib, python-scipy, libfreeimage3, python-imaging Standards-Version: 3.9.2 XS-Python-Version: >= 2.5 Homepage: http://scikits-image.org @@ -14,7 +14,7 @@ Package: python-skimage Architecture: all Depends: ${misc:Depends}, ${python:Depends}, python-numpy, python-scipy, python-skimage-lib (>= ${source:Version}), libfreeimage3 Provides: ${python:Provides} -Recommends: python-nose, python-matplotlib +Recommends: python-nose, python-matplotlib, python-imaging Suggests: python-skimage-doc, python-opencv Description: Python modules for image processing scikits-image is a collection of image processing algorithms for From 93a983cb08c075f68207491fba0b3ba5a3ce0a23 Mon Sep 17 00:00:00 2001 From: Yaroslav Halchenko Date: Tue, 24 Apr 2012 12:51:40 -0400 Subject: [PATCH 27/27] fixing some typos and minor in debian/rules --- debian/rules | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/debian/rules b/debian/rules index cc81b15e..8c49c1ba 100755 --- a/debian/rules +++ b/debian/rules @@ -35,13 +35,13 @@ ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) : # Run unittests export PYTHONPATH=$(PACKAGE_ROOT_DIR)/usr/lib/python$*/dist-packages; \ python$* /usr/bin/nosetests -s \ - $(PACKAGE_ROOT_DIR)/usr/lib/python$*/*/skimage + $(PACKAGE_ROOT_DIR)/usr/lib/python$*/*-packages/skimage else : # Skip unittests due to nocheck endif : # Move platform-specific libraries into -lib - for lib in $$(find $(PACKAGE_ROOT_DIR)/usr -name '*.so'); do \ + set -e; for lib in $$(find $(PACKAGE_ROOT_DIR)/usr -name '*.so'); do \ sdir=$$(dirname $$lib) ; \ tdir=$(PACKAGE_ROOT_DIR)-lib/$${sdir#*$(PACKAGE_NAME)/} ; \ mkdir -p $$tdir ; \ @@ -53,8 +53,8 @@ endif -rm -f doc/build/html/_static/jquery.js # Actually due to the problems with underscore pkg across releases just ship one for now #-rm -f doc/build/html/_static/underscore.js - -rf -f doc/build/html/_sources - -rf -f doc/build/html/.buildinfo + -rm -rf doc/build/html/_sources + -rm -f doc/build/html/.buildinfo : # Move documentation to -doc sdir=$(CURDIR)/doc/build/html ; \ @@ -70,4 +70,4 @@ override_dh_compress: dh_compress -X.py -X.html -X.pdf -X.css -X.jpg -X.txt -X.js -X.json -X.rtc override_dh_installdocs: - dh_installdocs -A CONTRIBUTORS.txt README.txt DEVELOPMENT.txt TASKS.txt + dh_installdocs -A CONTRIBUTORS.txt README.rst DEVELOPMENT.txt TASKS.txt