From adcc59efe95aaa77d167aade7ee3cbb2c8c737f5 Mon Sep 17 00:00:00 2001
From: Yaroslav Halchenko <debian@onerussian.com>
Date: Tue, 24 Apr 2012 12:41:51 -0400
Subject: [PATCH] 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