BF: little fixes around

debian/control

@@ -16,15 +16,15 @@ Depends: ${misc:Depends}, ${python:Depends}, python-numpy, python-scipy, python-
 Provides: ${python:Provides}
 XB-Python-Version: ${python:Versions}
 Recommends: python-nose, python-psyco, python-matplotlib
-Suggests: python-mvpa, python-mdp, python-scikits-learn-doc
-Description: python modules for machine learning and data mining
- scikit-learn is a collection of python modules relevant to
+Suggests: python-dap, python-scikits-optimization, python-scikits-learn-doc
+Description: Python modules for machine learning and data mining
+ scikit-learn is a collection of Python modules relevant to
  machine/statistical learning and data mining.  Non-exhaustive list of
  included functionality:
   - Gaussian Mixture Models
   - Manifold learning
   - kNN
-  - SVM (via libsvm)
+  - SVM (via LIBSVM)
 
 
 Package: python-scikits-learn-doc

debian/rules

@@ -22,7 +22,7 @@ ifeq (,$(filter nodoc,$(DEB_BUILD_OPTIONS)))
 endif
 
 clean::
-	$(MAKE) distclean
+	rm -rf build doc/_build
 
 # run at install otherwise at build it tends to do them twice for some
 # reason
@@ -41,7 +41,7 @@ build/python-scikits-learn-doc:: doc
 # use jquery from Debian package
 # symlinked by debhelper
 install/python-scikits-learn-doc::
-	-rm build/html/_static/jquery.js
+	-rm doc/_build/html/_static/jquery.js
 
 install/python-scikits-learn-lib::
 	# move libraries into the python-scikits-learn-lib package
@@ -71,7 +71,7 @@ DEB_DESTDIR = $(CURDIR)/debian/python-scikits-learn
 DEB_COMPRESS_EXCLUDE := .py .pdf .html .css .jpg .txt .js .json .rtc .par .bin
 # -doc package contents
 ifeq (,$(filter nodoc,$(DEB_BUILD_OPTIONS)))
-DEB_INSTALL_DOCS_python-scikits-learn-doc := build/html
+DEB_INSTALL_DOCS_python-scikits-learn-doc := doc/_build/html
 DEB_INSTALL_EXAMPLES_python-scikits-learn-doc := examples/*
 endif