[python-scientific] 02/02: rebase the patch series to build with openmpi 1.6.2

[Frédéric-Emmanuel Picca]

This is an automated email from the git hooks/post-receive script.

picca pushed a commit to branch master
in repository python-scientific.

commit 70f1b2dfa81915128393c5e79db3aafdde0f6ac2
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date:   Mon Aug 19 20:54:24 2013 +0200

    rebase the patch series to build with openmpi 1.6.2
---
 debian/patches/0001-replace-PyObject_NEW-Pyobject_new.patch |    7 +++----
 debian/patches/0002-debian-deal-with-mpi-compilers.patch    |   11 +++++------
 .../0003-feature-forwarded-numpy-arrayobject-header.patch   |    7 +++----
 3 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/debian/patches/0001-replace-PyObject_NEW-Pyobject_new.patch b/debian/patches/0001-replace-PyObject_NEW-Pyobject_new.patch
index 6466005..9e8b10e 100644
--- a/debian/patches/0001-replace-PyObject_NEW-Pyobject_new.patch
+++ b/debian/patches/0001-replace-PyObject_NEW-Pyobject_new.patch
@@ -3,8 +3,8 @@ Date: Tue, 20 Sep 2011 21:15:28 +0200
 Subject: replace PyObject_NEW -> Pyobject_new
 
 ---
- Src/MPI/Scientific_mpi.c |    6 +++---
- Src/Scientific_netcdf.c  |    2 +-
+ Src/MPI/Scientific_mpi.c | 6 +++---
+ Src/Scientific_netcdf.c  | 2 +-
  2 files changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/Src/MPI/Scientific_mpi.c b/Src/MPI/Scientific_mpi.c
@@ -39,7 +39,7 @@ index 4510ef1..cbf2240 100644
      return NULL;
    self->handle[0] = rq;
 diff --git a/Src/Scientific_netcdf.c b/Src/Scientific_netcdf.c
-index 3b4323b..a6818bd 100644
+index 45f6349..a963b3d 100644
 --- a/Src/Scientific_netcdf.c
 +++ b/Src/Scientific_netcdf.c
 @@ -1313,7 +1313,7 @@ netcdf_variable_new(PyNetCDFFileObject *file, char *name, int id, int type,
@@ -51,4 +51,3 @@ index 3b4323b..a6818bd 100644
      if (self == NULL)
        return NULL;
      self->file = file;
--- 
diff --git a/debian/patches/0002-debian-deal-with-mpi-compilers.patch b/debian/patches/0002-debian-deal-with-mpi-compilers.patch
index e645b78..e4d2b5f 100644
--- a/debian/patches/0002-debian-deal-with-mpi-compilers.patch
+++ b/debian/patches/0002-debian-deal-with-mpi-compilers.patch
@@ -1,13 +1,13 @@
 From: =?UTF-8?q?Picca=20Fr=C3=A9d=C3=A9ric-Emmanuel?= <picca at debian.org>
-Date: Tue, 20 Sep 2011 21:17:10 +0200
+Date: Mon, 19 Aug 2013 20:53:05 +0200
 Subject: debian deal with mpi compilers
 
 ---
- Src/MPI/compile.py |   16 +++++++++++++++-
- 1 files changed, 15 insertions(+), 1 deletions(-)
+ Src/MPI/compile.py | 16 +++++++++++++++-
+ 1 file changed, 15 insertions(+), 1 deletion(-)
 
 diff --git a/Src/MPI/compile.py b/Src/MPI/compile.py
-index 1352686..e37055d 100644
+index 1352686..ba310e0 100644
 --- a/Src/MPI/compile.py
 +++ b/Src/MPI/compile.py
 @@ -11,6 +11,18 @@ cfgDict = distutils.sysconfig.get_config_vars()
@@ -19,7 +19,7 @@ index 1352686..e37055d 100644
 +
 +if os.environ.has_key('USE_OPENMPI'):
 +    mpicompiler = 'mpicc.openmpi'
-+    mpiinclude = '/usr/include/openmpi'
++    mpiinclude = '/usr/include/openmpi -lmpi'
 +    executable = 'mpipython.openmpi'
 +if os.environ.has_key('USE_MPICH'):
 +    mpicompiler = 'mpicc.mpich2'
@@ -42,4 +42,3 @@ index 1352686..e37055d 100644
       cfgDict['INCLUDEPY'],
       extra_compile_args,
       sources,
--- 
diff --git a/debian/patches/0003-feature-forwarded-numpy-arrayobject-header.patch b/debian/patches/0003-feature-forwarded-numpy-arrayobject-header.patch
index bdeeb09..0d2b43d 100644
--- a/debian/patches/0003-feature-forwarded-numpy-arrayobject-header.patch
+++ b/debian/patches/0003-feature-forwarded-numpy-arrayobject-header.patch
@@ -3,11 +3,11 @@ Date: Tue, 20 Sep 2011 21:17:59 +0200
 Subject: feature forwarded numpy arrayobject header
 
 ---
- Src/MPI/compile.py |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
+ Src/MPI/compile.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/Src/MPI/compile.py b/Src/MPI/compile.py
-index e37055d..829e0e1 100644
+index ba310e0..fde75b6 100644
 --- a/Src/MPI/compile.py
 +++ b/Src/MPI/compile.py
 @@ -28,8 +28,8 @@ sources='mpipython.c Scientific_mpi.c'
@@ -21,4 +21,3 @@ index e37055d..829e0e1 100644
      extra_compile_args = "-DNUMPY=1 -I"+arrayobject_h_include
  
  linkforshared = cfgDict['LINKFORSHARED']
--- 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/python-scientific.git