[adios] 190/207: WIP: patch fix

[Alastair McKinstry]

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

mckinstry pushed a commit to branch master
in repository adios.

commit eb2ee64dfecba7782c333ad5ffb44652fcd3244d
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Sun May 3 12:33:55 2015 +0100

    WIP: patch fix
---
 debian/patches/deprecate_numpy17.patch |  4 ++--
 debian/patches/numpy_paths.patch       | 15 ++++++++++++++-
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/debian/patches/deprecate_numpy17.patch b/debian/patches/deprecate_numpy17.patch
index 170a13c..6ba3d1b 100644
--- a/debian/patches/deprecate_numpy17.patch
+++ b/debian/patches/deprecate_numpy17.patch
@@ -8,7 +8,7 @@ Index: adios-1.8.0/wrappers/numpy/setup.py
                 sources=['adios.cpp'], 
 -               define_macros=[('_NOMPI', None)],
 +               define_macros=[('_NOMPI', None), ('NPY_NO_DEPRECATED_API', 'NPY_1_7_API_VERSION')],
-                include_dirs = [np.get_include()],
+                include_dirs = [np.get_include(), '../../src/public'],
                 library_dirs = [],
                 libraries = [],
 Index: adios-1.8.0/wrappers/numpy/setup_mpi.py
@@ -21,6 +21,6 @@ Index: adios-1.8.0/wrappers/numpy/setup_mpi.py
                 sources=['adios_mpi.cpp'], 
 -               define_macros=[],
 +               define_macros=[('NPY_NO_DEPRECATED_API', 'NPY_1_7_API_VERSION')],
-                include_dirs = [np.get_include()],
+                include_dirs = [np.get_include(), '../../src/public'],
                 library_dirs = [],
                 libraries = [],
diff --git a/debian/patches/numpy_paths.patch b/debian/patches/numpy_paths.patch
index 3282a17..03dce93 100644
--- a/debian/patches/numpy_paths.patch
+++ b/debian/patches/numpy_paths.patch
@@ -5,7 +5,20 @@ Index: adios-1.8.0/wrappers/numpy/setup.py
 @@ -14,7 +14,7 @@ import subprocess
  m1 = Extension('adios', 
                 sources=['adios.cpp'], 
-                define_macros=[('_NOMPI', None), ('NPY_NO_DEPRECATED_API', 'NPY_1_7_API_VERSION')],
+                define_macros=[('_NOMPI', None)],
+-               include_dirs = [np.get_include()],
++               include_dirs = [np.get_include(), '../../src/public'],
+                library_dirs = [],
+                libraries = [],
+                extra_objects = [])
+Index: adios-1.8.0/wrappers/numpy/setup_mpi.py
+===================================================================
+--- adios-1.8.0.orig/wrappers/numpy/setup_mpi.py
++++ adios-1.8.0/wrappers/numpy/setup_mpi.py
+@@ -14,7 +14,7 @@ import subprocess
+ m1 = Extension('adios_mpi', 
+                sources=['adios_mpi.cpp'], 
+                define_macros=[],
 -               include_dirs = [np.get_include()],
 +               include_dirs = [np.get_include(), '../../src/public'],
                 library_dirs = [],

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