Merge branch 'debian' into debian-release

* debian:
  actually doing arith operation and printing to avoid failed comparison
  Changelog for all previous commits
  adding a workaround to allow BFS (Closes: #588595)
  make nosetesting not suppressing output from code
  Build-Depend on python-numpy providing numpy-ext (Closes: #589590) + policy 3.9.0
  Added deb_cython_0.12.1 to use code cythoned with up-to-date cython 0.12.1

debian/changelog

+scikit-learn (0.4-2) unstable; urgency=low
+
+  * deb_cython_0.12.1 to use code cythoned with up-to-date cython
+    0.12.1
+  * Build-Depend on python-numpy providing numpy-ext (Closes: #589590)
+  * Policy compliance 3.9.0 -- no changes were due
+  * Nosetesting without suppressing output from code
+  * Workaround to allow BFS (Closes: #588595)
+
+ -- Yaroslav Halchenko <debian@onerussian.com>  Mon, 19 Jul 2010 12:32:06 -0400
+
 scikit-learn (0.4-1) unstable; urgency=low
 
   * Fresh upstream release:

debian/control

@@ -3,8 +3,8 @@ Section: python
 Priority: optional
 Maintainer: NeuroDebian Team <team@neuro.debian.net>
 Uploaders: Yaroslav Halchenko <debian@onerussian.com>, Michael Hanke <michael.hanke@gmail.com>
-Build-Depends: debhelper (>= 7.0.50), python-all-dev (>= 2.5), python-support (>= 0.6), python-numpy-ext, python-scipy, libsvm-dev (>= 2.84.0), python-sphinx, graphviz, python-nose, python-setuptools, cython, python-matplotlib, ipython, swig
-Standards-Version: 3.8.4
+Build-Depends: debhelper (>= 7.0.50), python-all-dev (>= 2.5), python-support (>= 0.6), python-numpy, python-scipy, libsvm-dev (>= 2.84.0), python-sphinx, graphviz, python-nose, python-setuptools, cython, python-matplotlib, ipython, swig
+Standards-Version: 3.9.0
 Homepage: http://scikit-learn.sourceforge.net
 Vcs-Browser: http://github.com/yarikoptic/scikit-learn
 Vcs-Git: git://github.com/yarikoptic/scikit-learn.git

debian/patches/series

+up_workaround_numpy_cython_issue589652
+deb_cython_0.12.1
 deb_use_system_libraries

debian/patches/up_workaround_numpy_cython_issue589652

+--- a/scikits/learn/tests/test_svm.py
++++ b/scikits/learn/tests/test_svm.py
+@@ -190,14 +190,20 @@ def test_margin():
+     Test predict_margin
+     TODO: more tests
+     """
++    print "I: create SVM"
+     clf = svm.SVC()
++    print "I: fit SVM"
+     clf.fit(X, Y)
+-    assert_array_almost_equal(clf.predict_margin(T),
++    print "I: obtain margin"
++    m = clf.predict_margin(T)
++    print "I: printing to avoid FTBFS #588595: ", (m-0)
++    print "I: compare"
++    assert_array_almost_equal(m,
+                               [[ 0.976],
+                                [-0.939],
+                                [-0.619]],
+                               decimal=3)
+-
++    print "I: done if ever"
+ 
+ def test_weight():
+     """

debian/rules

@@ -38,7 +38,7 @@ python-install%:
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 	: # Run unittests
 	export MPLCONFIGDIR=$(CURDIR)/build HOME=$(CURDIR)/build; \
-	 python$* /usr/bin/nosetests --exclude '(manifold|test_gmm_em)' \
+	 python$* /usr/bin/nosetests -s --exclude '(manifold|test_gmm_em)' \
 	  $(PACKAGE_ROOT_DIR)/usr/lib/python$*/*/scikits/learn
 else
 	: # Skip unittests due to nocheck