[Python-modules-commits] r21295 - in packages/scipy/trunk/debian (5 files)

[varun at users.alioth.debian.org]

    Date: Friday, April 20, 2012 @ 07:12:39
  Author: varun
Revision: 21295

* debian/control:
  - Recommends: python-imaging (Closes: #648036)
  - Recommends: python-dev (Closes: #651760)
* debian/patches:
  - Add kolmogorov.diff, thanks to Yaroslav Halchenko (Closes: #653948)
  - Add kde.diff (Closes: #648034)

Added:
  packages/scipy/trunk/debian/patches/kde.diff
  packages/scipy/trunk/debian/patches/kolmogorov.diff
Modified:
  packages/scipy/trunk/debian/changelog
  packages/scipy/trunk/debian/control
  packages/scipy/trunk/debian/patches/series

Modified: packages/scipy/trunk/debian/changelog
===================================================================
--- packages/scipy/trunk/debian/changelog	2012-04-20 05:10:54 UTC (rev 21294)
+++ packages/scipy/trunk/debian/changelog	2012-04-20 07:12:39 UTC (rev 21295)
@@ -1,3 +1,14 @@
+python-scipy (0.10.1+dfsg1-2) unstable; urgency=low
+
+  * debian/control:
+    - Recommends: python-imaging (Closes: #648036)
+    - Recommends: python-dev (Closes: #651760)
+  * debian/patches:
+    - Add kolmogorov.diff, thanks to Yaroslav Halchenko (Closes: #653948)
+    - Add kde.diff (Closes: #648034)
+
+ -- Varun Hiremath <varun at debian.org>  Fri, 20 Apr 2012 02:37:28 -0400
+
 python-scipy (0.10.1+dfsg1-1) unstable; urgency=low
 
   * New upstream release (Closes: #653262)

Modified: packages/scipy/trunk/debian/control
===================================================================
--- packages/scipy/trunk/debian/control	2012-04-20 05:10:54 UTC (rev 21294)
+++ packages/scipy/trunk/debian/control	2012-04-20 07:12:39 UTC (rev 21295)
@@ -8,7 +8,7 @@
  gfortran, sharutils, swig, libsuitesparse-dev (>= 3.1.0-3),
  libblas-dev | libatlas-base-dev, liblapack-dev | libatlas-base-dev
 X-Python-Version: >= 2.4
-Standards-Version: 3.9.1
+Standards-Version: 3.9.3
 Homepage: http://www.scipy.org/
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/scipy/trunk
 Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/scipy/trunk/
@@ -18,7 +18,7 @@
 Architecture: any
 Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}
 Provides: ${python:Provides}
-Recommends: g++ | c++-compiler
+Recommends: g++ | c++-compiler, python-imaging, python-dev
 Suggests: python-profiler
 Description: scientific tools for Python
  SciPy supplements the popular NumPy module (python-numpy package), gathering a

Added: packages/scipy/trunk/debian/patches/kde.diff
===================================================================
--- packages/scipy/trunk/debian/patches/kde.diff	                        (rev 0)
+++ packages/scipy/trunk/debian/patches/kde.diff	2012-04-20 07:12:39 UTC (rev 21295)
@@ -0,0 +1,13 @@
+Index: python-scipy-0.10.1+dfsg1/scipy/stats/kde.py
+===================================================================
+--- python-scipy-0.10.1+dfsg1.orig/scipy/stats/kde.py	2012-02-21 17:50:07.000000000 -0500
++++ python-scipy-0.10.1+dfsg1/scipy/stats/kde.py	2012-04-20 02:33:16.604248470 -0400
+@@ -79,7 +79,7 @@
+     """
+ 
+     def __init__(self, dataset):
+-        self.dataset = atleast_2d(dataset)
++        self.dataset = atleast_2d(dataset).astype('float')
+ 
+         self.d, self.n = self.dataset.shape
+ 

Added: packages/scipy/trunk/debian/patches/kolmogorov.diff
===================================================================
--- packages/scipy/trunk/debian/patches/kolmogorov.diff	                        (rev 0)
+++ packages/scipy/trunk/debian/patches/kolmogorov.diff	2012-04-20 07:12:39 UTC (rev 21295)
@@ -0,0 +1,50 @@
+Index: python-scipy-0.10.1+dfsg1/scipy/special/cephes/kolmogorov.c
+===================================================================
+--- python-scipy-0.10.1+dfsg1.orig/scipy/special/cephes/kolmogorov.c	2011-03-09 20:40:54.000000000 -0500
++++ python-scipy-0.10.1+dfsg1/scipy/special/cephes/kolmogorov.c	2012-04-20 02:36:30.630431206 -0400
+@@ -35,7 +35,7 @@
+   int v, nn;
+   double evn, omevn, p, t, c, lgamnp1;
+ 
+-  if (n <= 0 || e < 0.0 || e > 1.0)
++  if (!(n > 0 && e >= 0.0 && e <= 1.0))
+     return (NPY_NAN);
+   if (e == 0.0) return 1.0;
+   nn = (int) (floor ((double) n * (1.0 - e)));
+@@ -86,7 +86,7 @@
+ {
+   double p, t, r, sign, x;
+ 
+-  if ( y < 1.1e-16 ) 
++  if ( y < 1.1e-16 )
+     return 1.0;
+   x = -2.0 * y * y;
+   sign = 1.0;
+@@ -141,10 +141,10 @@
+ 	  mtherr ("smirnovi", OVERFLOW);
+ 	  return 0.0;
+ 	}
+-      if (++iterations > MAXITER) 
++      if (++iterations > MAXITER)
+         {
+           mtherr ("smirnovi", TOOMANY);
+-          return (e);          
++          return (e);
+         }
+     }
+   while (fabs (t / e) > 1e-10);
+@@ -185,11 +185,11 @@
+ 	  return 0.0;
+ 	}
+       y = y + t;
+-      if (++iterations > MAXITER) 
++      if (++iterations > MAXITER)
+         {
+           mtherr ("kolmogi", TOOMANY);
+-          return (y);          
+-        }      
++          return (y);
++        }
+     }
+   while (fabs (t / y) > 1.0e-10);
+   return (y);

Modified: packages/scipy/trunk/debian/patches/series
===================================================================
--- packages/scipy/trunk/debian/patches/series	2012-04-20 05:10:54 UTC (rev 21294)
+++ packages/scipy/trunk/debian/patches/series	2012-04-20 07:12:39 UTC (rev 21295)
@@ -1,2 +1,4 @@
+kde.diff
+kolmogorov.diff
 restore_sys_argv.patch
 blitz++.patch