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] 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