[adios] 189/207: Use later numpy API

[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 ec612d2bf024d7ff2301d085d66657b59e871bb3
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Sun May 3 12:29:24 2015 +0100

    Use later numpy API
---
 debian/patches/deprecate_numpy17.patch | 26 ++++++++++++++++++++++++++
 debian/patches/numpy_paths.patch       | 13 +++++++++++++
 debian/patches/series                  |  3 ++-
 3 files changed, 41 insertions(+), 1 deletion(-)

diff --git a/debian/patches/deprecate_numpy17.patch b/debian/patches/deprecate_numpy17.patch
new file mode 100644
index 0000000..170a13c
--- /dev/null
+++ b/debian/patches/deprecate_numpy17.patch
@@ -0,0 +1,26 @@
+Index: adios-1.8.0/wrappers/numpy/setup.py
+===================================================================
+--- adios-1.8.0.orig/wrappers/numpy/setup.py
++++ adios-1.8.0/wrappers/numpy/setup.py
+@@ -13,7 +13,7 @@ import subprocess
+ 
+ m1 = Extension('adios', 
+                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()],
+                library_dirs = [],
+                libraries = [],
+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
+@@ -13,7 +13,7 @@ import subprocess
+ 
+ m1 = Extension('adios_mpi', 
+                sources=['adios_mpi.cpp'], 
+-               define_macros=[],
++               define_macros=[('NPY_NO_DEPRECATED_API', 'NPY_1_7_API_VERSION')],
+                include_dirs = [np.get_include()],
+                library_dirs = [],
+                libraries = [],
diff --git a/debian/patches/numpy_paths.patch b/debian/patches/numpy_paths.patch
new file mode 100644
index 0000000..3282a17
--- /dev/null
+++ b/debian/patches/numpy_paths.patch
@@ -0,0 +1,13 @@
+Index: adios-1.8.0/wrappers/numpy/setup.py
+===================================================================
+--- adios-1.8.0.orig/wrappers/numpy/setup.py
++++ 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')],
+-               include_dirs = [np.get_include()],
++               include_dirs = [np.get_include(), '../../src/public'],
+                library_dirs = [],
+                libraries = [],
+                extra_objects = [])
diff --git a/debian/patches/series b/debian/patches/series
index 16c4c4c..a844c60 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,4 +6,5 @@ python3.patch
 debian_paths.patch
 mpi4py_fix.patch
 pkgconfig.patch
-# exclude-cmake.patch
+numpy_paths.patch
+deprecate_numpy17.patch

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