[Python-modules-team] Bug#598520: Patch from Ubuntu

[Stefano Rivera]

tags 598520 patch
thanks

Patch adapted from the Ubuntu patch attached.

SR

-- 
Stefano Rivera
  http://tumbleweed.org.za/
  H: +27 21 465 6908 C: +27 72 419 8559  UCT: x3127
-------------- next part --------------
diff -Nru python-scipy-0.7.2+dfsg1/debian/changelog python-scipy-0.7.2+dfsg1/debian/changelog
--- python-scipy-0.7.2+dfsg1/debian/changelog	2010-07-31 00:35:56.000000000 +0200
+++ python-scipy-0.7.2+dfsg1/debian/changelog	2010-09-29 19:08:07.000000000 +0200
@@ -1,3 +1,15 @@
+python-scipy (0.7.2+dfsg1-2) UNRELEASED; urgency=low
+
+  [ Luca Falavigna ]
+  * Remove myself from Uploaders.
+
+  [ Stefano Rivera ]
+  * Team Upload
+  * debian/patches/blitz++.patch: Fix scipy.weave.inline compilations. Thanks
+    to Sameer Morar (Closes: #598520, LP: #302649)
+
+ -- Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>  Wed, 29 Sep 2010 15:22:10 +0200
+
 python-scipy (0.7.2+dfsg1-1) unstable; urgency=low
 
   * Release with a new source tarball with missing cython source files
diff -Nru python-scipy-0.7.2+dfsg1/debian/control python-scipy-0.7.2+dfsg1/debian/control
--- python-scipy-0.7.2+dfsg1/debian/control	2010-07-30 23:29:44.000000000 +0200
+++ python-scipy-0.7.2+dfsg1/debian/control	2010-07-31 12:46:30.000000000 +0200
@@ -2,7 +2,7 @@
 Section: python
 Priority: extra
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
-Uploaders: Alexandre Fayolle <afayolle at debian.org>, Ondrej Certik <ondrej at certik.cz>, David Cournapeau <cournape at gmail.com>, Luca Falavigna <dktrkranz at debian.org>, Varun Hiremath <varun at debian.org>
+Uploaders: Alexandre Fayolle <afayolle at debian.org>, Ondrej Certik <ondrej at certik.cz>, David Cournapeau <cournape at gmail.com>, Varun Hiremath <varun at debian.org>
 Build-Depends: debhelper (>= 7.0.50~), python-all-dev (>= 2.5.4-1~),
  python-all-dbg (>= 2.5.4-1~), python-central (>= 0.6.7),
  python-numpy (>= 1:1.4.1-4~), python-numpy-dbg (>= 1:1.2.0),
diff -Nru python-scipy-0.7.2+dfsg1/debian/patches/blitz++.patch python-scipy-0.7.2+dfsg1/debian/patches/blitz++.patch
--- python-scipy-0.7.2+dfsg1/debian/patches/blitz++.patch	1970-01-01 02:00:00.000000000 +0200
+++ python-scipy-0.7.2+dfsg1/debian/patches/blitz++.patch	2010-09-29 19:09:02.000000000 +0200
@@ -0,0 +1,45 @@
+Description: Fixes scipy.weave.inline compalition with g++ 4.3 and upwards
+Author: Sameer Morar <smorar at gmail.com>
+Forwarded: http://projects.scipy.org/scipy/scipy/ticket/739
+Bug-Debian: http://bugs.debian.org/598520
+Bug-Ubuntu: https://launchpad.net/bugs/302649
+
+Index: python-scipy-0.7.2/scipy/weave/blitz/blitz/blitz.h
+===================================================================
+--- python-scipy-0.7.2.orig/scipy/weave/blitz/blitz/blitz.h	2010-09-29 13:17:01.539914362 +0200
++++ python-scipy-0.7.2/scipy/weave/blitz/blitz/blitz.h	2010-09-29 13:17:02.091914362 +0200
+@@ -65,6 +65,8 @@
+ 
+ #define BZ_THROW                     // Needed in <blitz/numinquire.h>
+ 
++#include <cstdlib>
++
+ BZ_NAMESPACE(blitz)
+ 
+ #ifdef BZ_HAVE_STD
+Index: python-scipy-0.7.2/scipy/weave/blitz/blitz/mathfunc.h
+===================================================================
+--- python-scipy-0.7.2.orig/scipy/weave/blitz/blitz/mathfunc.h	2010-09-29 13:17:01.507914362 +0200
++++ python-scipy-0.7.2/scipy/weave/blitz/blitz/mathfunc.h	2010-09-29 13:17:02.099914362 +0200
+@@ -12,6 +12,8 @@
+  #include <blitz/prettyprint.h>
+ #endif
+ 
++#include <cstdlib>
++
+ BZ_NAMESPACE(blitz)
+ 
+ // abs(P_numtype1)    Absolute value
+Index: python-scipy-0.7.2/scipy/weave/blitz/blitz/prettyprint.h
+===================================================================
+--- python-scipy-0.7.2.orig/scipy/weave/blitz/blitz/prettyprint.h	2010-09-29 13:20:04.091914362 +0200
++++ python-scipy-0.7.2/scipy/weave/blitz/blitz/prettyprint.h	2010-09-29 13:18:19.611914362 +0200
+@@ -22,6 +22,8 @@
+ #ifndef BZ_PRETTYPRINT_H
+ #define BZ_PRETTYPRINT_H
+ 
++#include <cstdlib>
++
+ BZ_NAMESPACE(blitz)
+ 
+ class prettyPrintFormat {
diff -Nru python-scipy-0.7.2+dfsg1/debian/patches/series python-scipy-0.7.2+dfsg1/debian/patches/series
--- python-scipy-0.7.2+dfsg1/debian/patches/series	2010-06-07 14:51:28.000000000 +0200
+++ python-scipy-0.7.2+dfsg1/debian/patches/series	2010-09-29 15:22:29.000000000 +0200
@@ -1,2 +1,3 @@
 restore_sys_argv.patch
 string_exception.patch
+blitz++.patch