[adios] 03/04: Refresh patches

Alastair McKinstry mckinstry at moszumanska.debian.org
Tue Aug 18 15:58:34 UTC 2015


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

mckinstry pushed a commit to branch debian/master
in repository adios.

commit ee415a715314be018042f4e8ddb29556c082096c
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Sat Aug 15 11:53:11 2015 +0100

    Refresh patches
---
 debian/patches/autotools-fixes.patch |  10 +-
 debian/patches/debian_paths.patch    |  24 +--
 debian/patches/exclude_cmake.patch   |  32 +---
 debian/patches/mpi4py_fix.patch      |  12 +-
 debian/patches/multiarch_safe.patch  | 288 +++++++++++++++++------------------
 debian/patches/netcdf-fix.patch      |   8 +-
 debian/patches/numpy_paths.patch     |  34 ++---
 debian/patches/pkgconfig.patch       |  80 +++++-----
 debian/patches/python3.patch         | 172 ++++++++++-----------
 debian/patches/python_wrapper.patch  |  66 ++++----
 10 files changed, 349 insertions(+), 377 deletions(-)

diff --git a/debian/patches/autotools-fixes.patch b/debian/patches/autotools-fixes.patch
index e5afa06..e8678ac 100644
--- a/debian/patches/autotools-fixes.patch
+++ b/debian/patches/autotools-fixes.patch
@@ -3,15 +3,15 @@ Description: Remove indented comments that autotools now choke on
 Last-Updated: 2015-06-15
 Forwarded: no
 
-Index: adios-1.8.0/Makefile.am
+Index: adios-1.9.0/Makefile.am
 ===================================================================
---- adios-1.8.0.orig/Makefile.am
-+++ adios-1.8.0/Makefile.am
-@@ -51,7 +51,5 @@ install-data-hook:
+--- adios-1.9.0.orig/Makefile.am
++++ adios-1.9.0/Makefile.am
+@@ -53,7 +53,5 @@ install-data-hook:
  	    echo "GITSTAT=\"git status not available\"" >> adios_git_status; \
  	    echo "Note: git command not found or $(PWD) is not a git repository."; \
  	fi 
 -	#$(INSTALL_DATA) adios_config.flags $(DESTDIR)$(sysconfdir)
 -	#$(INSTALL_DATA) adios_git_status $(DESTDIR)$(sysconfdir)
          
- CLEANFILES = adios_config adios_config.flags
+ CLEANFILES = 
diff --git a/debian/patches/debian_paths.patch b/debian/patches/debian_paths.patch
index 3d878a5..6b0941a 100644
--- a/debian/patches/debian_paths.patch
+++ b/debian/patches/debian_paths.patch
@@ -3,10 +3,10 @@ Description: Change paths to match Debian and FHS
 Forwarded: no
 Last-Updated: 2013-12-09
 
-Index: adios-1.8.0/utils/skel/lib/skel_makefile.py
+Index: adios-1.9.0/utils/skel/lib/skel_makefile.py
 ===================================================================
---- adios-1.8.0.orig/utils/skel/lib/skel_makefile.py
-+++ adios-1.8.0/utils/skel/lib/skel_makefile.py
+--- adios-1.9.0.orig/utils/skel/lib/skel_makefile.py
++++ adios-1.9.0/utils/skel/lib/skel_makefile.py
 @@ -67,7 +67,7 @@ def generate_makefile_from_yaml (args):
  
      # Only proceed if outfilename does not already exist, or if -f was used
@@ -25,10 +25,10 @@ Index: adios-1.8.0/utils/skel/lib/skel_makefile.py
  
      bindir = os.path.abspath(os.path.dirname(sys.argv[0]))        
  
-Index: adios-1.8.0/utils/skel/lib/skel_settings.py
+Index: adios-1.9.0/utils/skel/lib/skel_settings.py
 ===================================================================
---- adios-1.8.0.orig/utils/skel/lib/skel_settings.py
-+++ adios-1.8.0/utils/skel/lib/skel_settings.py
+--- adios-1.9.0.orig/utils/skel/lib/skel_settings.py
++++ adios-1.9.0/utils/skel/lib/skel_settings.py
 @@ -54,7 +54,7 @@ def create_settings_dir_if_needed():
      skel_settings_dir_name = os.path.expanduser ('~/.skel')
      if not os.path.exists (skel_settings_dir_name):
@@ -38,10 +38,10 @@ Index: adios-1.8.0/utils/skel/lib/skel_settings.py
          print('Created ' + skel_settings_dir_name)
  
  
-Index: adios-1.8.0/utils/gpp/ad_config.py
+Index: adios-1.9.0/utils/gpp/ad_config.py
 ===================================================================
---- adios-1.8.0.orig/utils/gpp/ad_config.py
-+++ adios-1.8.0/utils/gpp/ad_config.py
+--- adios-1.9.0.orig/utils/gpp/ad_config.py
++++ adios-1.9.0/utils/gpp/ad_config.py
 @@ -1,3 +1,4 @@
 +#!/usr/bin/env python
  from __future__ import absolute_import, division, print_function, unicode_literals
@@ -56,10 +56,10 @@ Index: adios-1.8.0/utils/gpp/ad_config.py
              return self.vardict [varfullpath]
  
          return None
-Index: adios-1.8.0/utils/gpp/type_mapper.py
+Index: adios-1.9.0/utils/gpp/type_mapper.py
 ===================================================================
---- adios-1.8.0.orig/utils/gpp/type_mapper.py
-+++ adios-1.8.0/utils/gpp/type_mapper.py
+--- adios-1.9.0.orig/utils/gpp/type_mapper.py
++++ adios-1.9.0/utils/gpp/type_mapper.py
 @@ -1,4 +1,4 @@
 -
 +#!/usr/bin/env python
diff --git a/debian/patches/exclude_cmake.patch b/debian/patches/exclude_cmake.patch
index c8a80d8..bc9e1e6 100644
--- a/debian/patches/exclude_cmake.patch
+++ b/debian/patches/exclude_cmake.patch
@@ -4,21 +4,11 @@ Bug-Debian: http://bugs.debian.org/784766
 Forwarded: no
 Last-Update: 2015-05-11
 
-Index: adios-1.8.0/Makefile.am
+Index: adios-1.9.0/Makefile.am
 ===================================================================
---- adios-1.8.0.orig/Makefile.am
-+++ adios-1.8.0/Makefile.am
-@@ -8,8 +8,7 @@ EXTRA_DIST = runconf \
- 	     adios.pc.in \
-              scripts/create.nssi.config.sh \
-              scripts/kill.nssi.staging.sh \
--             scripts/start.nssi.staging.sh \
--	     scripts/FindADIOS.cmake
-+             scripts/start.nssi.staging.sh
- 
- #             wrappers/matlab/Makefile \
- #             wrappers/matlab/adios.m \
-@@ -28,7 +27,7 @@ if HAVE_NSSI
+--- adios-1.9.0.orig/Makefile.am
++++ adios-1.9.0/Makefile.am
+@@ -29,7 +29,7 @@ if HAVE_NSSI
                     scripts/start.nssi.staging.sh
  endif
  
@@ -27,17 +17,3 @@ Index: adios-1.8.0/Makefile.am
  
  #install-data-hook:
  #	echo -n "VERSIONSTRING=\"$(PACKAGE) version $(VERSION) svn revision " >> adios_config.flags
-Index: adios-1.8.0/Makefile.in
-===================================================================
---- adios-1.8.0.orig/Makefile.in
-+++ adios-1.8.0/Makefile.in
-@@ -436,8 +436,7 @@ EXTRA_DIST = runconf \
- 	     adios.pc \
-              scripts/create.nssi.config.sh \
-              scripts/kill.nssi.staging.sh \
--             scripts/start.nssi.staging.sh \
--	     scripts/FindADIOS.cmake
-+             scripts/start.nssi.staging.s
- 
- 
- #             wrappers/matlab/Makefile \
diff --git a/debian/patches/mpi4py_fix.patch b/debian/patches/mpi4py_fix.patch
index 0538c18..bfe6108 100644
--- a/debian/patches/mpi4py_fix.patch
+++ b/debian/patches/mpi4py_fix.patch
@@ -3,11 +3,11 @@ Description: Fix for missing MPI_Message in MPI < 3
 Last-Updated: 2014-05-19
 Forwarded: no
 
-Index: adios-1.8.0/wrappers/numpy/adios.pyx
+Index: adios-1.9.0/wrappers/numpy/adios.pyx
 ===================================================================
---- adios-1.8.0.orig/wrappers/numpy/adios.pyx
-+++ adios-1.8.0/wrappers/numpy/adios.pyx
-@@ -15,6 +15,8 @@ cimport numpy as np
+--- adios-1.9.0.orig/wrappers/numpy/adios.pyx
++++ adios-1.9.0/wrappers/numpy/adios.pyx
+@@ -10,6 +10,8 @@ cimport numpy as np
  #import mpi4py.MPI_as MPI_
  #cimport mpi4py.MPI_as MPI
  
@@ -16,10 +16,10 @@ Index: adios-1.8.0/wrappers/numpy/adios.pyx
  import cython
  cimport cython
  
-Index: adios-1.8.0/wrappers/numpy/compat.h
+Index: adios-1.9.0/wrappers/numpy/compat.h
 ===================================================================
 --- /dev/null
-+++ adios-1.8.0/wrappers/numpy/compat.h
++++ adios-1.9.0/wrappers/numpy/compat.h
 @@ -0,0 +1,9 @@
 +/* Added to fix missing MPI_Message in older openmpi on Debian, etc
 + * Added mckinstry at debian.org, 2014-05-19
diff --git a/debian/patches/multiarch_safe.patch b/debian/patches/multiarch_safe.patch
index e2cb51b..4d6ae51 100644
--- a/debian/patches/multiarch_safe.patch
+++ b/debian/patches/multiarch_safe.patch
@@ -5,11 +5,11 @@ Description: Make example files multi-arch safe by extracting @host@, @build@
 Last-Updated: 2015-07-02
 Forwarded: not-needed
 
-Index: adios-1.8.0/examples/C/arrays/Makefile.in
+Index: adios-1.9.0/examples/C/arrays/Makefile.in
 ===================================================================
---- adios-1.8.0.orig/examples/C/arrays/Makefile.in	2015-06-22 16:37:15.000000000 +0100
-+++ adios-1.8.0/examples/C/arrays/Makefile.in	2015-07-01 16:12:02.074948284 +0100
-@@ -32,8 +32,8 @@
+--- adios-1.9.0.orig/examples/C/arrays/Makefile.in
++++ adios-1.9.0/examples/C/arrays/Makefile.in
+@@ -32,8 +32,8 @@ POST_INSTALL = :
  NORMAL_UNINSTALL = :
  PRE_UNINSTALL = :
  POST_UNINSTALL = :
@@ -20,7 +20,7 @@ Index: adios-1.8.0/examples/C/arrays/Makefile.in
  noinst_PROGRAMS = arrays_write$(EXEEXT) arrays_read$(EXEEXT)
  subdir = examples/C/arrays
  DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-@@ -330,7 +330,7 @@
+@@ -333,7 +333,7 @@ am__quote = @am__quote@
  am__tar = @am__tar@
  am__untar = @am__untar@
  bindir = @bindir@
@@ -29,7 +29,7 @@ Index: adios-1.8.0/examples/C/arrays/Makefile.in
  build_alias = @build_alias@
  build_cpu = @build_cpu@
  build_os = @build_os@
-@@ -341,7 +341,7 @@
+@@ -344,7 +344,7 @@ datarootdir = @datarootdir@
  docdir = @docdir@
  dvidir = @dvidir@
  exec_prefix = @exec_prefix@
@@ -38,11 +38,11 @@ Index: adios-1.8.0/examples/C/arrays/Makefile.in
  host_alias = @host_alias@
  host_cpu = @host_cpu@
  host_os = @host_os@
-Index: adios-1.8.0/examples/C/attributes/Makefile.in
+Index: adios-1.9.0/examples/C/attributes/Makefile.in
 ===================================================================
---- adios-1.8.0.orig/examples/C/attributes/Makefile.in	2015-06-22 16:37:15.000000000 +0100
-+++ adios-1.8.0/examples/C/attributes/Makefile.in	2015-07-01 16:12:02.102949089 +0100
-@@ -32,8 +32,8 @@
+--- adios-1.9.0.orig/examples/C/attributes/Makefile.in
++++ adios-1.9.0/examples/C/attributes/Makefile.in
+@@ -32,8 +32,8 @@ POST_INSTALL = :
  NORMAL_UNINSTALL = :
  PRE_UNINSTALL = :
  POST_UNINSTALL = :
@@ -53,7 +53,7 @@ Index: adios-1.8.0/examples/C/attributes/Makefile.in
  noinst_PROGRAMS = attributes_write$(EXEEXT) attributes_read$(EXEEXT)
  subdir = examples/C/attributes
  DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-@@ -330,7 +330,7 @@
+@@ -333,7 +333,7 @@ am__quote = @am__quote@
  am__tar = @am__tar@
  am__untar = @am__untar@
  bindir = @bindir@
@@ -62,7 +62,7 @@ Index: adios-1.8.0/examples/C/attributes/Makefile.in
  build_alias = @build_alias@
  build_cpu = @build_cpu@
  build_os = @build_os@
-@@ -341,7 +341,7 @@
+@@ -344,7 +344,7 @@ datarootdir = @datarootdir@
  docdir = @docdir@
  dvidir = @dvidir@
  exec_prefix = @exec_prefix@
@@ -71,11 +71,11 @@ Index: adios-1.8.0/examples/C/attributes/Makefile.in
  host_alias = @host_alias@
  host_cpu = @host_cpu@
  host_os = @host_os@
-Index: adios-1.8.0/examples/C/flexpath_arrays/global_range_select/Makefile.in
+Index: adios-1.9.0/examples/C/flexpath_arrays/global_range_select/Makefile.in
 ===================================================================
---- adios-1.8.0.orig/examples/C/flexpath_arrays/global_range_select/Makefile.in	2015-06-22 16:37:15.000000000 +0100
-+++ adios-1.8.0/examples/C/flexpath_arrays/global_range_select/Makefile.in	2015-07-01 16:12:02.178951273 +0100
-@@ -32,8 +32,8 @@
+--- adios-1.9.0.orig/examples/C/flexpath_arrays/global_range_select/Makefile.in
++++ adios-1.9.0/examples/C/flexpath_arrays/global_range_select/Makefile.in
+@@ -32,8 +32,8 @@ POST_INSTALL = :
  NORMAL_UNINSTALL = :
  PRE_UNINSTALL = :
  POST_UNINSTALL = :
@@ -86,7 +86,7 @@ Index: adios-1.8.0/examples/C/flexpath_arrays/global_range_select/Makefile.in
  noinst_PROGRAMS = arrays_write$(EXEEXT) arrays_read$(EXEEXT)
  subdir = examples/C/flexpath_arrays/global_range_select
  DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-@@ -330,7 +330,7 @@
+@@ -333,7 +333,7 @@ am__quote = @am__quote@
  am__tar = @am__tar@
  am__untar = @am__untar@
  bindir = @bindir@
@@ -95,7 +95,7 @@ Index: adios-1.8.0/examples/C/flexpath_arrays/global_range_select/Makefile.in
  build_alias = @build_alias@
  build_cpu = @build_cpu@
  build_os = @build_os@
-@@ -341,7 +341,7 @@
+@@ -344,7 +344,7 @@ datarootdir = @datarootdir@
  docdir = @docdir@
  dvidir = @dvidir@
  exec_prefix = @exec_prefix@
@@ -104,11 +104,11 @@ Index: adios-1.8.0/examples/C/flexpath_arrays/global_range_select/Makefile.in
  host_alias = @host_alias@
  host_cpu = @host_cpu@
  host_os = @host_os@
-Index: adios-1.8.0/examples/C/flexpath_arrays/Makefile.in
+Index: adios-1.9.0/examples/C/flexpath_arrays/Makefile.in
 ===================================================================
---- adios-1.8.0.orig/examples/C/flexpath_arrays/Makefile.in	2015-06-22 16:37:15.000000000 +0100
-+++ adios-1.8.0/examples/C/flexpath_arrays/Makefile.in	2015-07-01 16:12:02.166950928 +0100
-@@ -31,8 +31,8 @@
+--- adios-1.9.0.orig/examples/C/flexpath_arrays/Makefile.in
++++ adios-1.9.0/examples/C/flexpath_arrays/Makefile.in
+@@ -31,8 +31,8 @@ POST_INSTALL = :
  NORMAL_UNINSTALL = :
  PRE_UNINSTALL = :
  POST_UNINSTALL = :
@@ -119,7 +119,7 @@ Index: adios-1.8.0/examples/C/flexpath_arrays/Makefile.in
  subdir = examples/C/flexpath_arrays
  DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-@@ -338,7 +338,7 @@
+@@ -341,7 +341,7 @@ am__quote = @am__quote@
  am__tar = @am__tar@
  am__untar = @am__untar@
  bindir = @bindir@
@@ -128,7 +128,7 @@ Index: adios-1.8.0/examples/C/flexpath_arrays/Makefile.in
  build_alias = @build_alias@
  build_cpu = @build_cpu@
  build_os = @build_os@
-@@ -349,7 +349,7 @@
+@@ -352,7 +352,7 @@ datarootdir = @datarootdir@
  docdir = @docdir@
  dvidir = @dvidir@
  exec_prefix = @exec_prefix@
@@ -137,11 +137,11 @@ Index: adios-1.8.0/examples/C/flexpath_arrays/Makefile.in
  host_alias = @host_alias@
  host_cpu = @host_cpu@
  host_os = @host_os@
-Index: adios-1.8.0/examples/C/flexpath_arrays/process_select/Makefile.in
+Index: adios-1.9.0/examples/C/flexpath_arrays/process_select/Makefile.in
 ===================================================================
---- adios-1.8.0.orig/examples/C/flexpath_arrays/process_select/Makefile.in	2015-06-22 16:37:15.000000000 +0100
-+++ adios-1.8.0/examples/C/flexpath_arrays/process_select/Makefile.in	2015-07-01 16:12:02.170951043 +0100
-@@ -32,8 +32,8 @@
+--- adios-1.9.0.orig/examples/C/flexpath_arrays/process_select/Makefile.in
++++ adios-1.9.0/examples/C/flexpath_arrays/process_select/Makefile.in
+@@ -32,8 +32,8 @@ POST_INSTALL = :
  NORMAL_UNINSTALL = :
  PRE_UNINSTALL = :
  POST_UNINSTALL = :
@@ -152,7 +152,7 @@ Index: adios-1.8.0/examples/C/flexpath_arrays/process_select/Makefile.in
  noinst_PROGRAMS = arrays_write$(EXEEXT) arrays_read$(EXEEXT)
  subdir = examples/C/flexpath_arrays/process_select
  DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-@@ -330,7 +330,7 @@
+@@ -333,7 +333,7 @@ am__quote = @am__quote@
  am__tar = @am__tar@
  am__untar = @am__untar@
  bindir = @bindir@
@@ -161,7 +161,7 @@ Index: adios-1.8.0/examples/C/flexpath_arrays/process_select/Makefile.in
  build_alias = @build_alias@
  build_cpu = @build_cpu@
  build_os = @build_os@
-@@ -341,7 +341,7 @@
+@@ -344,7 +344,7 @@ datarootdir = @datarootdir@
  docdir = @docdir@
  dvidir = @dvidir@
  exec_prefix = @exec_prefix@
@@ -170,11 +170,11 @@ Index: adios-1.8.0/examples/C/flexpath_arrays/process_select/Makefile.in
  host_alias = @host_alias@
  host_cpu = @host_cpu@
  host_os = @host_os@
-Index: adios-1.8.0/examples/C/global-array/Makefile.in
+Index: adios-1.9.0/examples/C/global-array/Makefile.in
 ===================================================================
---- adios-1.8.0.orig/examples/C/global-array/Makefile.in	2015-06-22 16:37:15.000000000 +0100
-+++ adios-1.8.0/examples/C/global-array/Makefile.in	2015-07-01 16:12:02.142950238 +0100
-@@ -32,8 +32,8 @@
+--- adios-1.9.0.orig/examples/C/global-array/Makefile.in
++++ adios-1.9.0/examples/C/global-array/Makefile.in
+@@ -32,8 +32,8 @@ POST_INSTALL = :
  NORMAL_UNINSTALL = :
  PRE_UNINSTALL = :
  POST_UNINSTALL = :
@@ -185,7 +185,7 @@ Index: adios-1.8.0/examples/C/global-array/Makefile.in
  noinst_PROGRAMS = adios_global$(EXEEXT) adios_global_2files$(EXEEXT) \
  	adios_read_gpp$(EXEEXT) adios_read_global$(EXEEXT) \
  	adios_read_writeblock$(EXEEXT) adios_read_chunk$(EXEEXT) \
-@@ -415,7 +415,7 @@
+@@ -418,7 +418,7 @@ am__quote = @am__quote@
  am__tar = @am__tar@
  am__untar = @am__untar@
  bindir = @bindir@
@@ -194,7 +194,7 @@ Index: adios-1.8.0/examples/C/global-array/Makefile.in
  build_alias = @build_alias@
  build_cpu = @build_cpu@
  build_os = @build_os@
-@@ -426,7 +426,7 @@
+@@ -429,7 +429,7 @@ datarootdir = @datarootdir@
  docdir = @docdir@
  dvidir = @dvidir@
  exec_prefix = @exec_prefix@
@@ -203,11 +203,11 @@ Index: adios-1.8.0/examples/C/global-array/Makefile.in
  host_alias = @host_alias@
  host_cpu = @host_cpu@
  host_os = @host_os@
-Index: adios-1.8.0/examples/C/global-array-time/Makefile.in
+Index: adios-1.9.0/examples/C/global-array-time/Makefile.in
 ===================================================================
---- adios-1.8.0.orig/examples/C/global-array-time/Makefile.in	2015-06-22 16:37:15.000000000 +0100
-+++ adios-1.8.0/examples/C/global-array-time/Makefile.in	2015-07-01 16:12:02.118949549 +0100
-@@ -32,8 +32,8 @@
+--- adios-1.9.0.orig/examples/C/global-array-time/Makefile.in
++++ adios-1.9.0/examples/C/global-array-time/Makefile.in
+@@ -32,8 +32,8 @@ POST_INSTALL = :
  NORMAL_UNINSTALL = :
  PRE_UNINSTALL = :
  POST_UNINSTALL = :
@@ -218,7 +218,7 @@ Index: adios-1.8.0/examples/C/global-array-time/Makefile.in
  noinst_PROGRAMS = adios_globaltime$(EXEEXT) \
  	adios_globaltime_no_xml$(EXEEXT) \
  	adios_read_globaltime$(EXEEXT) \
-@@ -358,7 +358,7 @@
+@@ -361,7 +361,7 @@ am__quote = @am__quote@
  am__tar = @am__tar@
  am__untar = @am__untar@
  bindir = @bindir@
@@ -227,7 +227,7 @@ Index: adios-1.8.0/examples/C/global-array-time/Makefile.in
  build_alias = @build_alias@
  build_cpu = @build_cpu@
  build_os = @build_os@
-@@ -369,7 +369,7 @@
+@@ -372,7 +372,7 @@ datarootdir = @datarootdir@
  docdir = @docdir@
  dvidir = @dvidir@
  exec_prefix = @exec_prefix@
@@ -236,11 +236,11 @@ Index: adios-1.8.0/examples/C/global-array-time/Makefile.in
  host_alias = @host_alias@
  host_cpu = @host_cpu@
  host_os = @host_os@
-Index: adios-1.8.0/examples/C/icee_arrays/array/Makefile.in
+Index: adios-1.9.0/examples/C/icee_arrays/array/Makefile.in
 ===================================================================
---- adios-1.8.0.orig/examples/C/icee_arrays/array/Makefile.in	2015-06-22 16:37:15.000000000 +0100
-+++ adios-1.8.0/examples/C/icee_arrays/array/Makefile.in	2015-07-01 16:12:02.138950123 +0100
-@@ -32,8 +32,8 @@
+--- adios-1.9.0.orig/examples/C/icee_arrays/array/Makefile.in
++++ adios-1.9.0/examples/C/icee_arrays/array/Makefile.in
+@@ -32,8 +32,8 @@ POST_INSTALL = :
  NORMAL_UNINSTALL = :
  PRE_UNINSTALL = :
  POST_UNINSTALL = :
@@ -251,7 +251,7 @@ Index: adios-1.8.0/examples/C/icee_arrays/array/Makefile.in
  noinst_PROGRAMS = adios_write$(EXEEXT) adios_read$(EXEEXT)
  subdir = examples/C/icee_arrays/array
  DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-@@ -330,7 +330,7 @@
+@@ -333,7 +333,7 @@ am__quote = @am__quote@
  am__tar = @am__tar@
  am__untar = @am__untar@
  bindir = @bindir@
@@ -260,7 +260,7 @@ Index: adios-1.8.0/examples/C/icee_arrays/array/Makefile.in
  build_alias = @build_alias@
  build_cpu = @build_cpu@
  build_os = @build_os@
-@@ -341,7 +341,7 @@
+@@ -344,7 +344,7 @@ datarootdir = @datarootdir@
  docdir = @docdir@
  dvidir = @dvidir@
  exec_prefix = @exec_prefix@
@@ -269,11 +269,11 @@ Index: adios-1.8.0/examples/C/icee_arrays/array/Makefile.in
  host_alias = @host_alias@
  host_cpu = @host_cpu@
  host_os = @host_os@
-Index: adios-1.8.0/examples/C/icee_arrays/Makefile.in
+Index: adios-1.9.0/examples/C/icee_arrays/Makefile.in
 ===================================================================
---- adios-1.8.0.orig/examples/C/icee_arrays/Makefile.in	2015-06-22 16:37:15.000000000 +0100
-+++ adios-1.8.0/examples/C/icee_arrays/Makefile.in	2015-07-01 16:12:02.130949893 +0100
-@@ -31,8 +31,8 @@
+--- adios-1.9.0.orig/examples/C/icee_arrays/Makefile.in
++++ adios-1.9.0/examples/C/icee_arrays/Makefile.in
+@@ -31,8 +31,8 @@ POST_INSTALL = :
  NORMAL_UNINSTALL = :
  PRE_UNINSTALL = :
  POST_UNINSTALL = :
@@ -284,7 +284,7 @@ Index: adios-1.8.0/examples/C/icee_arrays/Makefile.in
  subdir = examples/C/icee_arrays
  DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-@@ -338,7 +338,7 @@
+@@ -341,7 +341,7 @@ am__quote = @am__quote@
  am__tar = @am__tar@
  am__untar = @am__untar@
  bindir = @bindir@
@@ -293,7 +293,7 @@ Index: adios-1.8.0/examples/C/icee_arrays/Makefile.in
  build_alias = @build_alias@
  build_cpu = @build_cpu@
  build_os = @build_os@
-@@ -349,7 +349,7 @@
+@@ -352,7 +352,7 @@ datarootdir = @datarootdir@
  docdir = @docdir@
  dvidir = @dvidir@
  exec_prefix = @exec_prefix@
@@ -302,11 +302,11 @@ Index: adios-1.8.0/examples/C/icee_arrays/Makefile.in
  host_alias = @host_alias@
  host_cpu = @host_cpu@
  host_os = @host_os@
-Index: adios-1.8.0/examples/C/Makefile.in
+Index: adios-1.9.0/examples/C/Makefile.in
 ===================================================================
---- adios-1.8.0.orig/examples/C/Makefile.in	2015-06-22 16:37:15.000000000 +0100
-+++ adios-1.8.0/examples/C/Makefile.in	2015-07-01 16:12:02.066948054 +0100
-@@ -31,8 +31,8 @@
+--- adios-1.9.0.orig/examples/C/Makefile.in
++++ adios-1.9.0/examples/C/Makefile.in
+@@ -31,8 +31,8 @@ POST_INSTALL = :
  NORMAL_UNINSTALL = :
  PRE_UNINSTALL = :
  POST_UNINSTALL = :
@@ -317,7 +317,7 @@ Index: adios-1.8.0/examples/C/Makefile.in
  subdir = examples/C
  DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-@@ -338,7 +338,7 @@
+@@ -341,7 +341,7 @@ am__quote = @am__quote@
  am__tar = @am__tar@
  am__untar = @am__untar@
  bindir = @bindir@
@@ -326,7 +326,7 @@ Index: adios-1.8.0/examples/C/Makefile.in
  build_alias = @build_alias@
  build_cpu = @build_cpu@
  build_os = @build_os@
-@@ -349,7 +349,7 @@
+@@ -352,7 +352,7 @@ datarootdir = @datarootdir@
  docdir = @docdir@
  dvidir = @dvidir@
  exec_prefix = @exec_prefix@
@@ -335,11 +335,11 @@ Index: adios-1.8.0/examples/C/Makefile.in
  host_alias = @host_alias@
  host_cpu = @host_cpu@
  host_os = @host_os@
-Index: adios-1.8.0/examples/C/manual/Makefile.in
+Index: adios-1.9.0/examples/C/manual/Makefile.in
 ===================================================================
---- adios-1.8.0.orig/examples/C/manual/Makefile.in	2015-06-22 16:37:15.000000000 +0100
-+++ adios-1.8.0/examples/C/manual/Makefile.in	2015-07-01 16:12:02.114949434 +0100
-@@ -32,8 +32,8 @@
+--- adios-1.9.0.orig/examples/C/manual/Makefile.in
++++ adios-1.9.0/examples/C/manual/Makefile.in
+@@ -32,8 +32,8 @@ POST_INSTALL = :
  NORMAL_UNINSTALL = :
  PRE_UNINSTALL = :
  POST_UNINSTALL = :
@@ -350,7 +350,7 @@ Index: adios-1.8.0/examples/C/manual/Makefile.in
  noinst_PROGRAMS = 1_nonadios_example$(EXEEXT) 2_adios_write$(EXEEXT) \
  	3_adios_read$(EXEEXT) 4_adios_nfiles$(EXEEXT)
  subdir = examples/C/manual
-@@ -347,7 +347,7 @@
+@@ -350,7 +350,7 @@ am__quote = @am__quote@
  am__tar = @am__tar@
  am__untar = @am__untar@
  bindir = @bindir@
@@ -359,7 +359,7 @@ Index: adios-1.8.0/examples/C/manual/Makefile.in
  build_alias = @build_alias@
  build_cpu = @build_cpu@
  build_os = @build_os@
-@@ -358,7 +358,7 @@
+@@ -361,7 +361,7 @@ datarootdir = @datarootdir@
  docdir = @docdir@
  dvidir = @dvidir@
  exec_prefix = @exec_prefix@
@@ -368,11 +368,11 @@ Index: adios-1.8.0/examples/C/manual/Makefile.in
  host_alias = @host_alias@
  host_cpu = @host_cpu@
  host_os = @host_os@
-Index: adios-1.8.0/examples/C/query/Makefile.in
+Index: adios-1.9.0/examples/C/query/Makefile.in
 ===================================================================
---- adios-1.8.0.orig/examples/C/query/Makefile.in	2015-06-22 16:37:15.000000000 +0100
-+++ adios-1.8.0/examples/C/query/Makefile.in	2015-07-01 16:12:02.150950468 +0100
-@@ -32,8 +32,8 @@
+--- adios-1.9.0.orig/examples/C/query/Makefile.in
++++ adios-1.9.0/examples/C/query/Makefile.in
+@@ -32,8 +32,8 @@ POST_INSTALL = :
  NORMAL_UNINSTALL = :
  PRE_UNINSTALL = :
  POST_UNINSTALL = :
@@ -383,7 +383,7 @@ Index: adios-1.8.0/examples/C/query/Makefile.in
  noinst_PROGRAMS = write_vars$(EXEEXT) query_vars$(EXEEXT) \
  	write_table$(EXEEXT) query_table$(EXEEXT)
  subdir = examples/C/query
-@@ -347,7 +347,7 @@
+@@ -350,7 +350,7 @@ am__quote = @am__quote@
  am__tar = @am__tar@
  am__untar = @am__untar@
  bindir = @bindir@
@@ -392,7 +392,7 @@ Index: adios-1.8.0/examples/C/query/Makefile.in
  build_alias = @build_alias@
  build_cpu = @build_cpu@
  build_os = @build_os@
-@@ -358,7 +358,7 @@
+@@ -361,7 +361,7 @@ datarootdir = @datarootdir@
  docdir = @docdir@
  dvidir = @dvidir@
  exec_prefix = @exec_prefix@
@@ -401,11 +401,11 @@ Index: adios-1.8.0/examples/C/query/Makefile.in
  host_alias = @host_alias@
  host_cpu = @host_cpu@
  host_os = @host_os@
-Index: adios-1.8.0/examples/C/read_all/Makefile.in
+Index: adios-1.9.0/examples/C/read_all/Makefile.in
 ===================================================================
---- adios-1.8.0.orig/examples/C/read_all/Makefile.in	2015-06-22 16:37:15.000000000 +0100
-+++ adios-1.8.0/examples/C/read_all/Makefile.in	2015-07-01 16:12:02.094948859 +0100
-@@ -32,8 +32,8 @@
+--- adios-1.9.0.orig/examples/C/read_all/Makefile.in
++++ adios-1.9.0/examples/C/read_all/Makefile.in
+@@ -32,8 +32,8 @@ POST_INSTALL = :
  NORMAL_UNINSTALL = :
  PRE_UNINSTALL = :
  POST_UNINSTALL = :
@@ -416,7 +416,7 @@ Index: adios-1.8.0/examples/C/read_all/Makefile.in
  noinst_PROGRAMS = read_all$(EXEEXT) read_all_v1$(EXEEXT)
  subdir = examples/C/read_all
  DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-@@ -330,7 +330,7 @@
+@@ -333,7 +333,7 @@ am__quote = @am__quote@
  am__tar = @am__tar@
  am__untar = @am__untar@
  bindir = @bindir@
@@ -425,7 +425,7 @@ Index: adios-1.8.0/examples/C/read_all/Makefile.in
  build_alias = @build_alias@
  build_cpu = @build_cpu@
  build_os = @build_os@
-@@ -341,7 +341,7 @@
+@@ -344,7 +344,7 @@ datarootdir = @datarootdir@
  docdir = @docdir@
  dvidir = @dvidir@
  exec_prefix = @exec_prefix@
@@ -434,11 +434,11 @@ Index: adios-1.8.0/examples/C/read_all/Makefile.in
  host_alias = @host_alias@
  host_cpu = @host_cpu@
  host_os = @host_os@
-Index: adios-1.8.0/examples/C/scalars/Makefile.in
+Index: adios-1.9.0/examples/C/scalars/Makefile.in
 ===================================================================
---- adios-1.8.0.orig/examples/C/scalars/Makefile.in	2015-06-22 16:37:15.000000000 +0100
-+++ adios-1.8.0/examples/C/scalars/Makefile.in	2015-07-01 16:12:02.122949664 +0100
-@@ -32,8 +32,8 @@
+--- adios-1.9.0.orig/examples/C/scalars/Makefile.in
++++ adios-1.9.0/examples/C/scalars/Makefile.in
+@@ -32,8 +32,8 @@ POST_INSTALL = :
  NORMAL_UNINSTALL = :
  PRE_UNINSTALL = :
  POST_UNINSTALL = :
@@ -449,7 +449,7 @@ Index: adios-1.8.0/examples/C/scalars/Makefile.in
  noinst_PROGRAMS = scalars_write$(EXEEXT) scalars_read$(EXEEXT) \
  	scalars_write_step$(EXEEXT)
  subdir = examples/C/scalars
-@@ -340,7 +340,7 @@
+@@ -343,7 +343,7 @@ am__quote = @am__quote@
  am__tar = @am__tar@
  am__untar = @am__untar@
  bindir = @bindir@
@@ -458,7 +458,7 @@ Index: adios-1.8.0/examples/C/scalars/Makefile.in
  build_alias = @build_alias@
  build_cpu = @build_cpu@
  build_os = @build_os@
-@@ -351,7 +351,7 @@
+@@ -354,7 +354,7 @@ datarootdir = @datarootdir@
  docdir = @docdir@
  dvidir = @dvidir@
  exec_prefix = @exec_prefix@
@@ -467,11 +467,11 @@ Index: adios-1.8.0/examples/C/scalars/Makefile.in
  host_alias = @host_alias@
  host_cpu = @host_cpu@
  host_os = @host_os@
-Index: adios-1.8.0/examples/C/schema/Makefile.in
+Index: adios-1.9.0/examples/C/schema/Makefile.in
 ===================================================================
---- adios-1.8.0.orig/examples/C/schema/Makefile.in	2015-06-22 16:37:15.000000000 +0100
-+++ adios-1.8.0/examples/C/schema/Makefile.in	2015-07-01 16:12:02.082948514 +0100
-@@ -32,8 +32,8 @@
+--- adios-1.9.0.orig/examples/C/schema/Makefile.in
++++ adios-1.9.0/examples/C/schema/Makefile.in
+@@ -32,8 +32,8 @@ POST_INSTALL = :
  NORMAL_UNINSTALL = :
  PRE_UNINSTALL = :
  POST_UNINSTALL = :
@@ -482,7 +482,7 @@ Index: adios-1.8.0/examples/C/schema/Makefile.in
  noinst_PROGRAMS = uniform2d$(EXEEXT) rectilinear2d$(EXEEXT) \
  	structured2d$(EXEEXT) tri2d$(EXEEXT) triangle2d$(EXEEXT) \
  	uniform2d_noxml$(EXEEXT) rectilinear2d_noxml$(EXEEXT) \
-@@ -388,7 +388,7 @@
+@@ -391,7 +391,7 @@ am__quote = @am__quote@
  am__tar = @am__tar@
  am__untar = @am__untar@
  bindir = @bindir@
@@ -491,7 +491,7 @@ Index: adios-1.8.0/examples/C/schema/Makefile.in
  build_alias = @build_alias@
  build_cpu = @build_cpu@
  build_os = @build_os@
-@@ -399,7 +399,7 @@
+@@ -402,7 +402,7 @@ datarootdir = @datarootdir@
  docdir = @docdir@
  dvidir = @dvidir@
  exec_prefix = @exec_prefix@
@@ -500,11 +500,11 @@ Index: adios-1.8.0/examples/C/schema/Makefile.in
  host_alias = @host_alias@
  host_cpu = @host_cpu@
  host_os = @host_os@
-Index: adios-1.8.0/examples/C/stat/Makefile.in
+Index: adios-1.9.0/examples/C/stat/Makefile.in
 ===================================================================
---- adios-1.8.0.orig/examples/C/stat/Makefile.in	2015-06-22 16:37:15.000000000 +0100
-+++ adios-1.8.0/examples/C/stat/Makefile.in	2015-07-01 16:12:02.086948629 +0100
-@@ -32,8 +32,8 @@
+--- adios-1.9.0.orig/examples/C/stat/Makefile.in
++++ adios-1.9.0/examples/C/stat/Makefile.in
+@@ -32,8 +32,8 @@ POST_INSTALL = :
  NORMAL_UNINSTALL = :
  PRE_UNINSTALL = :
  POST_UNINSTALL = :
@@ -515,7 +515,7 @@ Index: adios-1.8.0/examples/C/stat/Makefile.in
  noinst_PROGRAMS = stat_write$(EXEEXT) stat_read$(EXEEXT)
  subdir = examples/C/stat
  DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-@@ -330,7 +330,7 @@
+@@ -333,7 +333,7 @@ am__quote = @am__quote@
  am__tar = @am__tar@
  am__untar = @am__untar@
  bindir = @bindir@
@@ -524,7 +524,7 @@ Index: adios-1.8.0/examples/C/stat/Makefile.in
  build_alias = @build_alias@
  build_cpu = @build_cpu@
  build_os = @build_os@
-@@ -341,7 +341,7 @@
+@@ -344,7 +344,7 @@ datarootdir = @datarootdir@
  docdir = @docdir@
  dvidir = @dvidir@
  exec_prefix = @exec_prefix@
@@ -533,11 +533,11 @@ Index: adios-1.8.0/examples/C/stat/Makefile.in
  host_alias = @host_alias@
  host_cpu = @host_cpu@
  host_os = @host_os@
-Index: adios-1.8.0/examples/C/transforms/Makefile.in
+Index: adios-1.9.0/examples/C/transforms/Makefile.in
 ===================================================================
---- adios-1.8.0.orig/examples/C/transforms/Makefile.in	2015-06-22 16:37:15.000000000 +0100
-+++ adios-1.8.0/examples/C/transforms/Makefile.in	2015-07-01 16:12:02.158950698 +0100
-@@ -32,8 +32,8 @@
+--- adios-1.9.0.orig/examples/C/transforms/Makefile.in
++++ adios-1.9.0/examples/C/transforms/Makefile.in
+@@ -32,8 +32,8 @@ POST_INSTALL = :
  NORMAL_UNINSTALL = :
  PRE_UNINSTALL = :
  POST_UNINSTALL = :
@@ -548,7 +548,7 @@ Index: adios-1.8.0/examples/C/transforms/Makefile.in
  noinst_PROGRAMS = adios_global$(EXEEXT) adios_read_subv$(EXEEXT) \
  	adios_read_points$(EXEEXT) adios_read_wb_subpg$(EXEEXT)
  subdir = examples/C/transforms
-@@ -347,7 +347,7 @@
+@@ -350,7 +350,7 @@ am__quote = @am__quote@
  am__tar = @am__tar@
  am__untar = @am__untar@
  bindir = @bindir@
@@ -557,7 +557,7 @@ Index: adios-1.8.0/examples/C/transforms/Makefile.in
  build_alias = @build_alias@
  build_cpu = @build_cpu@
  build_os = @build_os@
-@@ -358,7 +358,7 @@
+@@ -361,7 +361,7 @@ datarootdir = @datarootdir@
  docdir = @docdir@
  dvidir = @dvidir@
  exec_prefix = @exec_prefix@
@@ -566,11 +566,11 @@ Index: adios-1.8.0/examples/C/transforms/Makefile.in
  host_alias = @host_alias@
  host_cpu = @host_cpu@
  host_os = @host_os@
-Index: adios-1.8.0/examples/Fortran/arrays/Makefile.in
+Index: adios-1.9.0/examples/Fortran/arrays/Makefile.in
 ===================================================================
---- adios-1.8.0.orig/examples/Fortran/arrays/Makefile.in	2015-06-22 16:37:15.000000000 +0100
-+++ adios-1.8.0/examples/Fortran/arrays/Makefile.in	2015-07-01 16:12:02.190951618 +0100
-@@ -32,8 +32,8 @@
+--- adios-1.9.0.orig/examples/Fortran/arrays/Makefile.in
++++ adios-1.9.0/examples/Fortran/arrays/Makefile.in
+@@ -32,8 +32,8 @@ POST_INSTALL = :
  NORMAL_UNINSTALL = :
  PRE_UNINSTALL = :
  POST_UNINSTALL = :
@@ -581,7 +581,7 @@ Index: adios-1.8.0/examples/Fortran/arrays/Makefile.in
  noinst_PROGRAMS = arrays_write$(EXEEXT) arrays_read$(EXEEXT)
  subdir = examples/Fortran/arrays
  DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-@@ -327,7 +327,7 @@
+@@ -330,7 +330,7 @@ am__quote = @am__quote@
  am__tar = @am__tar@
  am__untar = @am__untar@
  bindir = @bindir@
@@ -590,7 +590,7 @@ Index: adios-1.8.0/examples/Fortran/arrays/Makefile.in
  build_alias = @build_alias@
  build_cpu = @build_cpu@
  build_os = @build_os@
-@@ -338,7 +338,7 @@
+@@ -341,7 +341,7 @@ datarootdir = @datarootdir@
  docdir = @docdir@
  dvidir = @dvidir@
  exec_prefix = @exec_prefix@
@@ -599,11 +599,11 @@ Index: adios-1.8.0/examples/Fortran/arrays/Makefile.in
  host_alias = @host_alias@
  host_cpu = @host_cpu@
  host_os = @host_os@
-Index: adios-1.8.0/examples/Fortran/global-array/Makefile.in
+Index: adios-1.9.0/examples/Fortran/global-array/Makefile.in
 ===================================================================
---- adios-1.8.0.orig/examples/Fortran/global-array/Makefile.in	2015-06-22 16:37:15.000000000 +0100
-+++ adios-1.8.0/examples/Fortran/global-array/Makefile.in	2015-07-01 16:12:02.218952422 +0100
-@@ -32,8 +32,8 @@
+--- adios-1.9.0.orig/examples/Fortran/global-array/Makefile.in
++++ adios-1.9.0/examples/Fortran/global-array/Makefile.in
+@@ -32,8 +32,8 @@ POST_INSTALL = :
  NORMAL_UNINSTALL = :
  PRE_UNINSTALL = :
  POST_UNINSTALL = :
@@ -614,7 +614,7 @@ Index: adios-1.8.0/examples/Fortran/global-array/Makefile.in
  noinst_PROGRAMS = adios_global$(EXEEXT) adios_global_no_xml$(EXEEXT) \
  	no_xml_write_byid$(EXEEXT)
  subdir = examples/Fortran/global-array
-@@ -337,7 +337,7 @@
+@@ -340,7 +340,7 @@ am__quote = @am__quote@
  am__tar = @am__tar@
  am__untar = @am__untar@
  bindir = @bindir@
@@ -623,7 +623,7 @@ Index: adios-1.8.0/examples/Fortran/global-array/Makefile.in
  build_alias = @build_alias@
  build_cpu = @build_cpu@
  build_os = @build_os@
-@@ -348,7 +348,7 @@
+@@ -351,7 +351,7 @@ datarootdir = @datarootdir@
  docdir = @docdir@
  dvidir = @dvidir@
  exec_prefix = @exec_prefix@
@@ -632,11 +632,11 @@ Index: adios-1.8.0/examples/Fortran/global-array/Makefile.in
  host_alias = @host_alias@
  host_cpu = @host_cpu@
  host_os = @host_os@
-Index: adios-1.8.0/examples/Fortran/global-array-time/Makefile.in
+Index: adios-1.9.0/examples/Fortran/global-array-time/Makefile.in
 ===================================================================
---- adios-1.8.0.orig/examples/Fortran/global-array-time/Makefile.in	2015-06-22 16:37:15.000000000 +0100
-+++ adios-1.8.0/examples/Fortran/global-array-time/Makefile.in	2015-07-01 16:12:02.206952077 +0100
-@@ -32,8 +32,8 @@
+--- adios-1.9.0.orig/examples/Fortran/global-array-time/Makefile.in
++++ adios-1.9.0/examples/Fortran/global-array-time/Makefile.in
+@@ -32,8 +32,8 @@ POST_INSTALL = :
  NORMAL_UNINSTALL = :
  PRE_UNINSTALL = :
  POST_UNINSTALL = :
@@ -647,7 +647,7 @@ Index: adios-1.8.0/examples/Fortran/global-array-time/Makefile.in
  noinst_PROGRAMS = adios_globaltime$(EXEEXT)
  subdir = examples/Fortran/global-array-time
  DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-@@ -320,7 +320,7 @@
+@@ -323,7 +323,7 @@ am__quote = @am__quote@
  am__tar = @am__tar@
  am__untar = @am__untar@
  bindir = @bindir@
@@ -656,7 +656,7 @@ Index: adios-1.8.0/examples/Fortran/global-array-time/Makefile.in
  build_alias = @build_alias@
  build_cpu = @build_cpu@
  build_os = @build_os@
-@@ -331,7 +331,7 @@
+@@ -334,7 +334,7 @@ datarootdir = @datarootdir@
  docdir = @docdir@
  dvidir = @dvidir@
  exec_prefix = @exec_prefix@
@@ -665,11 +665,11 @@ Index: adios-1.8.0/examples/Fortran/global-array-time/Makefile.in
  host_alias = @host_alias@
  host_cpu = @host_cpu@
  host_os = @host_os@
-Index: adios-1.8.0/examples/Fortran/Makefile.in
+Index: adios-1.9.0/examples/Fortran/Makefile.in
 ===================================================================
---- adios-1.8.0.orig/examples/Fortran/Makefile.in	2015-06-22 16:37:15.000000000 +0100
-+++ adios-1.8.0/examples/Fortran/Makefile.in	2015-07-01 16:12:02.186951503 +0100
-@@ -31,8 +31,8 @@
+--- adios-1.9.0.orig/examples/Fortran/Makefile.in
++++ adios-1.9.0/examples/Fortran/Makefile.in
+@@ -31,8 +31,8 @@ POST_INSTALL = :
  NORMAL_UNINSTALL = :
  PRE_UNINSTALL = :
  POST_UNINSTALL = :
@@ -680,7 +680,7 @@ Index: adios-1.8.0/examples/Fortran/Makefile.in
  subdir = examples/Fortran
  DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-@@ -338,7 +338,7 @@
+@@ -341,7 +341,7 @@ am__quote = @am__quote@
  am__tar = @am__tar@
  am__untar = @am__untar@
  bindir = @bindir@
@@ -689,7 +689,7 @@ Index: adios-1.8.0/examples/Fortran/Makefile.in
  build_alias = @build_alias@
  build_cpu = @build_cpu@
  build_os = @build_os@
-@@ -349,7 +349,7 @@
+@@ -352,7 +352,7 @@ datarootdir = @datarootdir@
  docdir = @docdir@
  dvidir = @dvidir@
  exec_prefix = @exec_prefix@
@@ -698,11 +698,11 @@ Index: adios-1.8.0/examples/Fortran/Makefile.in
  host_alias = @host_alias@
  host_cpu = @host_cpu@
  host_os = @host_os@
-Index: adios-1.8.0/examples/Fortran/scalars/Makefile.in
+Index: adios-1.9.0/examples/Fortran/scalars/Makefile.in
 ===================================================================
---- adios-1.8.0.orig/examples/Fortran/scalars/Makefile.in	2015-06-22 16:37:15.000000000 +0100
-+++ adios-1.8.0/examples/Fortran/scalars/Makefile.in	2015-07-01 16:12:02.210952192 +0100
-@@ -32,8 +32,8 @@
+--- adios-1.9.0.orig/examples/Fortran/scalars/Makefile.in
++++ adios-1.9.0/examples/Fortran/scalars/Makefile.in
+@@ -32,8 +32,8 @@ POST_INSTALL = :
  NORMAL_UNINSTALL = :
  PRE_UNINSTALL = :
  POST_UNINSTALL = :
@@ -713,7 +713,7 @@ Index: adios-1.8.0/examples/Fortran/scalars/Makefile.in
  noinst_PROGRAMS = scalars_write$(EXEEXT) scalars_read$(EXEEXT)
  subdir = examples/Fortran/scalars
  DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-@@ -327,7 +327,7 @@
+@@ -330,7 +330,7 @@ am__quote = @am__quote@
  am__tar = @am__tar@
  am__untar = @am__untar@
  bindir = @bindir@
@@ -722,7 +722,7 @@ Index: adios-1.8.0/examples/Fortran/scalars/Makefile.in
  build_alias = @build_alias@
  build_cpu = @build_cpu@
  build_os = @build_os@
-@@ -338,7 +338,7 @@
+@@ -341,7 +341,7 @@ datarootdir = @datarootdir@
  docdir = @docdir@
  dvidir = @dvidir@
  exec_prefix = @exec_prefix@
@@ -731,11 +731,11 @@ Index: adios-1.8.0/examples/Fortran/scalars/Makefile.in
  host_alias = @host_alias@
  host_cpu = @host_cpu@
  host_os = @host_os@
-Index: adios-1.8.0/examples/Fortran/schema/Makefile.in
+Index: adios-1.9.0/examples/Fortran/schema/Makefile.in
 ===================================================================
---- adios-1.8.0.orig/examples/Fortran/schema/Makefile.in	2015-06-22 16:37:15.000000000 +0100
-+++ adios-1.8.0/examples/Fortran/schema/Makefile.in	2015-07-01 16:12:02.198951848 +0100
-@@ -32,8 +32,8 @@
+--- adios-1.9.0.orig/examples/Fortran/schema/Makefile.in
++++ adios-1.9.0/examples/Fortran/schema/Makefile.in
+@@ -32,8 +32,8 @@ POST_INSTALL = :
  NORMAL_UNINSTALL = :
  PRE_UNINSTALL = :
  POST_UNINSTALL = :
@@ -746,7 +746,7 @@ Index: adios-1.8.0/examples/Fortran/schema/Makefile.in
  noinst_PROGRAMS = uniform2d_f_noxml$(EXEEXT) \
  	rectilinear2d_f_noxml$(EXEEXT) structured2d_f_noxml$(EXEEXT) \
  	tri2d_f_noxml$(EXEEXT) tri2d_f_noxml_seperate$(EXEEXT)
-@@ -354,7 +354,7 @@
+@@ -357,7 +357,7 @@ am__quote = @am__quote@
  am__tar = @am__tar@
  am__untar = @am__untar@
  bindir = @bindir@
@@ -755,7 +755,7 @@ Index: adios-1.8.0/examples/Fortran/schema/Makefile.in
  build_alias = @build_alias@
  build_cpu = @build_cpu@
  build_os = @build_os@
-@@ -365,7 +365,7 @@
+@@ -368,7 +368,7 @@ datarootdir = @datarootdir@
  docdir = @docdir@
  dvidir = @dvidir@
  exec_prefix = @exec_prefix@
@@ -764,11 +764,11 @@ Index: adios-1.8.0/examples/Fortran/schema/Makefile.in
  host_alias = @host_alias@
  host_cpu = @host_cpu@
  host_os = @host_os@
-Index: adios-1.8.0/examples/Makefile.in
+Index: adios-1.9.0/examples/Makefile.in
 ===================================================================
---- adios-1.8.0.orig/examples/Makefile.in	2015-06-22 16:37:15.000000000 +0100
-+++ adios-1.8.0/examples/Makefile.in	2015-07-01 16:12:02.226952652 +0100
-@@ -31,8 +31,8 @@
+--- adios-1.9.0.orig/examples/Makefile.in
++++ adios-1.9.0/examples/Makefile.in
+@@ -31,8 +31,8 @@ POST_INSTALL = :
  NORMAL_UNINSTALL = :
  PRE_UNINSTALL = :
  POST_UNINSTALL = :
@@ -779,7 +779,7 @@ Index: adios-1.8.0/examples/Makefile.in
  subdir = examples
  DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-@@ -338,7 +338,7 @@
+@@ -341,7 +341,7 @@ am__quote = @am__quote@
  am__tar = @am__tar@
  am__untar = @am__untar@
  bindir = @bindir@
@@ -788,7 +788,7 @@ Index: adios-1.8.0/examples/Makefile.in
  build_alias = @build_alias@
  build_cpu = @build_cpu@
  build_os = @build_os@
-@@ -349,7 +349,7 @@
+@@ -352,7 +352,7 @@ datarootdir = @datarootdir@
  docdir = @docdir@
  dvidir = @dvidir@
  exec_prefix = @exec_prefix@
diff --git a/debian/patches/netcdf-fix.patch b/debian/patches/netcdf-fix.patch
index d427f06..65e815d 100644
--- a/debian/patches/netcdf-fix.patch
+++ b/debian/patches/netcdf-fix.patch
@@ -4,10 +4,10 @@ Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=662995
 Forwarded: no
 Last-Updated: 2012-03-09
 
-Index: adios-1.8.0/utils/bp2ncd/Makefile.in
+Index: adios-1.9.0/utils/bp2ncd/Makefile.in
 ===================================================================
---- adios-1.8.0.orig/utils/bp2ncd/Makefile.in
-+++ adios-1.8.0/utils/bp2ncd/Makefile.in
+--- adios-1.9.0.orig/utils/bp2ncd/Makefile.in
++++ adios-1.9.0/utils/bp2ncd/Makefile.in
 @@ -115,12 +115,12 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCE
  ACLOCAL = @ACLOCAL@
  ADIOSLIB_CFLAGS = @ADIOSLIB_CFLAGS@
@@ -23,7 +23,7 @@ Index: adios-1.8.0/utils/bp2ncd/Makefile.in
  ADIOSLIB_LDFLAGS = @ADIOSLIB_LDFLAGS@
  ADIOSLIB_SEQ_CFLAGS = @ADIOSLIB_SEQ_CFLAGS@
  ADIOSLIB_SEQ_CPPFLAGS = @ADIOSLIB_SEQ_CPPFLAGS@
-@@ -380,7 +380,7 @@ bp2ncd_SOURCES = bp2ncd.c
+@@ -384,7 +384,7 @@ bp2ncd_SOURCES = bp2ncd.c
  @USE_PARALLEL_COMPILER_TRUE at bp2ncd_LDFLAGS = $(ADIOSLIB_LDFLAGS) -static-libtool-libs
  @USE_PARALLEL_COMPILER_FALSE at bp2ncd_LDADD = $(top_builddir)/src/libadios_internal_nompi.a \
  @USE_PARALLEL_COMPILER_FALSE@	$(ADIOSLIB_INT_LDADD)
diff --git a/debian/patches/numpy_paths.patch b/debian/patches/numpy_paths.patch
index 03dce93..7dfb2b4 100644
--- a/debian/patches/numpy_paths.patch
+++ b/debian/patches/numpy_paths.patch
@@ -1,8 +1,8 @@
-Index: adios-1.8.0/wrappers/numpy/setup.py
+Index: adios-1.9.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
+--- adios-1.9.0.orig/wrappers/numpy/setup.py
++++ adios-1.9.0/wrappers/numpy/setup.py
+@@ -17,7 +17,7 @@ import sys
  m1 = Extension('adios', 
                 sources=['adios.cpp'], 
                 define_macros=[('_NOMPI', None)],
@@ -10,17 +10,17 @@ Index: adios-1.8.0/wrappers/numpy/setup.py
 +               include_dirs = [np.get_include(), '../../src/public'],
                 library_dirs = [],
                 libraries = [],
-                extra_objects = [])
-Index: adios-1.8.0/wrappers/numpy/setup_mpi.py
+                extra_objects = [],
+Index: adios-1.9.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 = [],
-                libraries = [],
-                extra_objects = [])
+--- adios-1.9.0.orig/wrappers/numpy/setup_mpi.py
++++ adios-1.9.0/wrappers/numpy/setup_mpi.py
+@@ -27,7 +27,7 @@ def _do_usage():
+   sys.exit(0)
+ 
+ # Default option values
+-include_dirs = []
++include_dirs = [np.get_include(), '../../src/public'],
+ library_dirs = []
+ extra_compile_args = []
+ extra_link_args = []
diff --git a/debian/patches/pkgconfig.patch b/debian/patches/pkgconfig.patch
index 3b77871..c29ae8b 100644
--- a/debian/patches/pkgconfig.patch
+++ b/debian/patches/pkgconfig.patch
@@ -3,10 +3,10 @@ Description: pkgconfig support for  ADIOS in Debian
 Last-Updated: 2014-06-15
 Forwarded: no
 
-Index: adios-1.8.0/adios.pc.in
+Index: adios-1.9.0/adios.pc.in
 ===================================================================
 --- /dev/null
-+++ adios-1.8.0/adios.pc.in
++++ adios-1.9.0/adios.pc.in
 @@ -0,0 +1,53 @@
 +# Standard defines for pkg-config
 +prefix=@prefix@
@@ -61,52 +61,33 @@ Index: adios-1.8.0/adios.pc.in
 +Cflags: -I${prefix}/include @ADIOSLIB_CPPFLAGS@ @ADIOSLIB_CFLAGS@
 +Libs: ${ADIOS_CLIB}
 +Libs.private: -ldl
-Index: adios-1.8.0/configure.ac
+Index: adios-1.9.0/configure.ac
 ===================================================================
---- adios-1.8.0.orig/configure.ac
-+++ adios-1.8.0/configure.ac
-@@ -830,6 +830,7 @@ AC_CONFIG_FILES([Makefile
+--- adios-1.9.0.orig/configure.ac
++++ adios-1.9.0/configure.ac
+@@ -839,6 +839,7 @@ AC_CONFIG_FILES([Makefile
                   examples/Fortran/schema/Makefile
                   adios_config
                   adios_config.flags
-+                 adios.pc
++		 adios.pc
+                  src/public/adios_version.h
                  ])
  
- AC_OUTPUT
-Index: adios-1.8.0/Makefile.in
+Index: adios-1.9.0/Makefile.am
 ===================================================================
---- adios-1.8.0.orig/Makefile.in
-+++ adios-1.8.0/Makefile.in
-@@ -94,7 +94,7 @@ am__CONFIG_DISTCLEAN_FILES = config.stat
- mkinstalldirs = $(install_sh) -d
- CONFIG_HEADER = config.h
- CONFIG_CLEAN_FILES = utils/skel/lib/skel_have_adios_timing.py \
--	adios_config adios_config.flags
-+	adios_config adios_config.flags adios.pc
- CONFIG_CLEAN_VPATH_FILES =
- am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
- am__vpath_adj = case $$p in \
-@@ -433,6 +433,7 @@ SUBDIRS = src utils tests examples
- EXTRA_DIST = runconf \
-              KNOWN_BUGS \
-              adios_config.in \
-+	     adios.pc \
+--- adios-1.9.0.orig/Makefile.am
++++ adios-1.9.0/Makefile.am
+@@ -9,7 +9,8 @@ EXTRA_DIST = runconf \
               scripts/create.nssi.config.sh \
               scripts/kill.nssi.staging.sh \
               scripts/start.nssi.staging.sh \
-Index: adios-1.8.0/Makefile.am
-===================================================================
---- adios-1.8.0.orig/Makefile.am
-+++ adios-1.8.0/Makefile.am
-@@ -5,6 +5,7 @@ SUBDIRS=src utils tests examples
- EXTRA_DIST = runconf \
-              KNOWN_BUGS \
-              adios_config.in \
-+	     adios.pc.in \
-              scripts/create.nssi.config.sh \
-              scripts/kill.nssi.staging.sh \
-              scripts/start.nssi.staging.sh \
-@@ -19,7 +20,7 @@ EXTRA_DIST = runconf \
+-	     scripts/FindADIOS.cmake
++	     scripts/FindADIOS.cmake \
++	     adios.pc
+ 
+ #             wrappers/matlab/Makefile \
+ #             wrappers/matlab/adios.m \
+@@ -20,7 +21,7 @@ EXTRA_DIST = runconf \
  #             wrappers/matlab/adiosopenc.c \
  #             wrappers/matlab/adiosreadc.c 
  
@@ -115,3 +96,26 @@ Index: adios-1.8.0/Makefile.am
  
  if HAVE_NSSI
      bin_SCRIPTS += scripts/create.nssi.config.sh \
+Index: adios-1.9.0/Makefile.in
+===================================================================
+--- adios-1.9.0.orig/Makefile.in
++++ adios-1.9.0/Makefile.in
+@@ -95,7 +95,7 @@ am__CONFIG_DISTCLEAN_FILES = config.stat
+ mkinstalldirs = $(install_sh) -d
+ CONFIG_HEADER = config.h
+ CONFIG_CLEAN_FILES = utils/skel/lib/skel_have_adios_timing.py \
+-	adios_config adios_config.flags src/public/adios_version.h
++	adios_config adios_config.flags adios.pc src/public/adios_version.h
+ CONFIG_CLEAN_VPATH_FILES =
+ am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+ am__vpath_adj = case $$p in \
+@@ -441,7 +441,8 @@ EXTRA_DIST = runconf \
+              scripts/create.nssi.config.sh \
+              scripts/kill.nssi.staging.sh \
+              scripts/start.nssi.staging.sh \
+-	     scripts/FindADIOS.cmake
++	     scripts/FindADIOS.cmake \
++	     adios.pc
+ 
+ 
+ #             wrappers/matlab/Makefile \
diff --git a/debian/patches/python3.patch b/debian/patches/python3.patch
index 50d23bc..a8d1d45 100644
--- a/debian/patches/python3.patch
+++ b/debian/patches/python3.patch
@@ -3,10 +3,10 @@ Description: Make the python code python2-3 agnostic.
 Last-Updated:2015-05-02
 Forwarded: no
 
-Index: adios-1.8.0/utils/skel/bin/skel_extract.py
+Index: adios-1.9.0/utils/skel/bin/skel_extract.py
 ===================================================================
---- adios-1.8.0.orig/utils/skel/bin/skel_extract.py
-+++ adios-1.8.0/utils/skel/bin/skel_extract.py
+--- adios-1.9.0.orig/utils/skel/bin/skel_extract.py
++++ adios-1.9.0/utils/skel/bin/skel_extract.py
 @@ -1,5 +1,6 @@
  #!/usr/bin/env python
  
@@ -39,10 +39,10 @@ Index: adios-1.8.0/utils/skel/bin/skel_extract.py
  
      return iteration
  
-Index: adios-1.8.0/utils/skel/lib/skelconf.py
+Index: adios-1.9.0/utils/skel/lib/skelconf.py
 ===================================================================
---- adios-1.8.0.orig/utils/skel/lib/skelconf.py
-+++ adios-1.8.0/utils/skel/lib/skelconf.py
+--- adios-1.9.0.orig/utils/skel/lib/skelconf.py
++++ adios-1.9.0/utils/skel/lib/skelconf.py
 @@ -1,5 +1,5 @@
 +from __future__ import absolute_import, division, print_function, unicode_literals
  import xml.dom.minidom
@@ -59,10 +59,10 @@ Index: adios-1.8.0/utils/skel/lib/skelconf.py
              raise SystemExit
          self.config_node = nodes[0]
  
-Index: adios-1.8.0/utils/gpp/ad_config.py
+Index: adios-1.9.0/utils/gpp/ad_config.py
 ===================================================================
---- adios-1.8.0.orig/utils/gpp/ad_config.py
-+++ adios-1.8.0/utils/gpp/ad_config.py
+--- adios-1.9.0.orig/utils/gpp/ad_config.py
++++ adios-1.9.0/utils/gpp/ad_config.py
 @@ -1,3 +1,4 @@
 +from __future__ import absolute_import, division, print_function, unicode_literals
  import xml.dom.minidom
@@ -95,10 +95,10 @@ Index: adios-1.8.0/utils/gpp/ad_config.py
              cleandims = []
              #print '       get_dimensions of var '+self.get_fullpath()
              for d in dims:
-Index: adios-1.8.0/utils/gpp/gpp.py
+Index: adios-1.9.0/utils/gpp/gpp.py
 ===================================================================
---- adios-1.8.0.orig/utils/gpp/gpp.py
-+++ adios-1.8.0/utils/gpp/gpp.py
+--- adios-1.9.0.orig/utils/gpp/gpp.py
++++ adios-1.9.0/utils/gpp/gpp.py
 @@ -1,5 +1,5 @@
  #!/usr/bin/env python
 -
@@ -137,10 +137,10 @@ Index: adios-1.8.0/utils/gpp/gpp.py
          raise SystemExit
  
  
-Index: adios-1.8.0/utils/skel/lib/adios.py
+Index: adios-1.9.0/utils/skel/lib/adios.py
 ===================================================================
---- adios-1.8.0.orig/utils/skel/lib/adios.py
-+++ adios-1.8.0/utils/skel/lib/adios.py
+--- adios-1.9.0.orig/utils/skel/lib/adios.py
++++ adios-1.9.0/utils/skel/lib/adios.py
 @@ -1,5 +1,5 @@
 +from __future__ import print_function
  import xml.dom.minidom
@@ -175,10 +175,10 @@ Index: adios-1.8.0/utils/skel/lib/adios.py
              cleandims = []
              for d in dims:
  
-Index: adios-1.8.0/utils/skel/lib/argparse.py
+Index: adios-1.9.0/utils/skel/lib/argparse.py
 ===================================================================
---- adios-1.8.0.orig/utils/skel/lib/argparse.py
-+++ adios-1.8.0/utils/skel/lib/argparse.py
+--- adios-1.9.0.orig/utils/skel/lib/argparse.py
++++ adios-1.9.0/utils/skel/lib/argparse.py
 @@ -81,7 +81,6 @@ __all__ = [
      'ZERO_OR_MORE',
  ]
@@ -187,10 +187,10 @@ Index: adios-1.8.0/utils/skel/lib/argparse.py
  import copy as _copy
  import os as _os
  import re as _re
-Index: adios-1.8.0/utils/skel/lib/skel_install.py
+Index: adios-1.9.0/utils/skel/lib/skel_install.py
 ===================================================================
---- adios-1.8.0.orig/utils/skel/lib/skel_install.py
-+++ adios-1.8.0/utils/skel/lib/skel_install.py
+--- adios-1.9.0.orig/utils/skel/lib/skel_install.py
++++ adios-1.9.0/utils/skel/lib/skel_install.py
 @@ -1,5 +1,5 @@
  #!/usr/bin/env python
 -
@@ -198,10 +198,10 @@ Index: adios-1.8.0/utils/skel/lib/skel_install.py
  import skel_settings
  
  def main(argv=None):
-Index: adios-1.8.0/utils/skel/lib/skel_makefile.py
+Index: adios-1.9.0/utils/skel/lib/skel_makefile.py
 ===================================================================
---- adios-1.8.0.orig/utils/skel/lib/skel_makefile.py
-+++ adios-1.8.0/utils/skel/lib/skel_makefile.py
+--- adios-1.9.0.orig/utils/skel/lib/skel_makefile.py
++++ adios-1.9.0/utils/skel/lib/skel_makefile.py
 @@ -1,5 +1,7 @@
  #!/usr/bin/env python
  
@@ -243,10 +243,10 @@ Index: adios-1.8.0/utils/skel/lib/skel_makefile.py
          generate_makefiles_fortran (params)
  
  
-Index: adios-1.8.0/utils/skel/lib/skel_params.py
+Index: adios-1.9.0/utils/skel/lib/skel_params.py
 ===================================================================
---- adios-1.8.0.orig/utils/skel/lib/skel_params.py
-+++ adios-1.8.0/utils/skel/lib/skel_params.py
+--- adios-1.9.0.orig/utils/skel/lib/skel_params.py
++++ adios-1.9.0/utils/skel/lib/skel_params.py
 @@ -1,4 +1,5 @@
  #!/usr/bin/env python
 +from __future__ import absolute_import, division, print_function, unicode_literals
@@ -301,10 +301,10 @@ Index: adios-1.8.0/utils/skel/lib/skel_params.py
          return 999
  
      generate_param_file (args.project, outfilename, config, args.group)
-Index: adios-1.8.0/utils/skel/lib/skel_settings.py
+Index: adios-1.9.0/utils/skel/lib/skel_settings.py
 ===================================================================
---- adios-1.8.0.orig/utils/skel/lib/skel_settings.py
-+++ adios-1.8.0/utils/skel/lib/skel_settings.py
+--- adios-1.9.0.orig/utils/skel/lib/skel_settings.py
++++ adios-1.9.0/utils/skel/lib/skel_settings.py
 @@ -1,5 +1,5 @@
  #!/usr/bin/env python
 -
@@ -332,10 +332,10 @@ Index: adios-1.8.0/utils/skel/lib/skel_settings.py
  
  
  def main(argv=None):
-Index: adios-1.8.0/utils/skel/lib/skel_source.py
+Index: adios-1.9.0/utils/skel/lib/skel_source.py
 ===================================================================
---- adios-1.8.0.orig/utils/skel/lib/skel_source.py
-+++ adios-1.8.0/utils/skel/lib/skel_source.py
+--- adios-1.9.0.orig/utils/skel/lib/skel_source.py
++++ adios-1.9.0/utils/skel/lib/skel_source.py
 @@ -1,4 +1,5 @@
  #!/usr/bin/env python
 +from __future__ import absolute_import, division, print_function, unicode_literals
@@ -489,10 +489,10 @@ Index: adios-1.8.0/utils/skel/lib/skel_source.py
          return  
  
      # Determine the target language
-Index: adios-1.8.0/utils/skel/lib/skel_submit.py
+Index: adios-1.9.0/utils/skel/lib/skel_submit.py
 ===================================================================
---- adios-1.8.0.orig/utils/skel/lib/skel_submit.py
-+++ adios-1.8.0/utils/skel/lib/skel_submit.py
+--- adios-1.9.0.orig/utils/skel/lib/skel_submit.py
++++ adios-1.9.0/utils/skel/lib/skel_submit.py
 @@ -1,5 +1,5 @@
  #!/usr/bin/env python
 -
@@ -529,10 +529,10 @@ Index: adios-1.8.0/utils/skel/lib/skel_submit.py
              return 1
  
          generate_submit_scripts_from_xml (params)
-Index: adios-1.8.0/utils/skel/lib/skel_xml.py
+Index: adios-1.9.0/utils/skel/lib/skel_xml.py
 ===================================================================
---- adios-1.8.0.orig/utils/skel/lib/skel_xml.py
-+++ adios-1.8.0/utils/skel/lib/skel_xml.py
+--- adios-1.9.0.orig/utils/skel/lib/skel_xml.py
++++ adios-1.9.0/utils/skel/lib/skel_xml.py
 @@ -1,5 +1,6 @@
  #!/usr/bin/env python
  
@@ -558,25 +558,26 @@ Index: adios-1.8.0/utils/skel/lib/skel_xml.py
          return 999
  
      skel_file = open (outfilename, 'w')
-Index: adios-1.8.0/wrappers/numpy/tests/test_adios.py
+Index: adios-1.9.0/wrappers/numpy/tests/test_adios.py
 ===================================================================
---- adios-1.8.0.orig/wrappers/numpy/tests/test_adios.py
-+++ adios-1.8.0/wrappers/numpy/tests/test_adios.py
-@@ -5,11 +5,12 @@ Example:
+--- adios-1.9.0.orig/wrappers/numpy/tests/test_adios.py
++++ adios-1.9.0/wrappers/numpy/tests/test_adios.py
+@@ -5,12 +5,13 @@ Example:
  $ python ./test_adios.py
  """
  
 +from __future__ import print_function
  import adios as ad
  import numpy as np
+ import sys
  
  ## Writing
 -print "\n>>> Writing ...\n"
-+print( "\n>>> Writing ...\n")
++print ("\n>>> Writing ...\n")
  
- ad.init("config.xml")
- fd = ad.open("temperature", "adios_test.bp", "w")
-@@ -17,7 +18,7 @@ fd = ad.open("temperature", "adios_test.
+ config = "config.xml"
+ if len(sys.argv) > 1:
+@@ -22,7 +23,7 @@ fd = ad.open("temperature", "adios_test.
  NX = 10
  size = 2
  groupsize =  4 + 4 + 8 * size * NX
@@ -585,7 +586,7 @@ Index: adios-1.8.0/wrappers/numpy/tests/test_adios.py
  tt = t.reshape((size, NX))
  ad.set_group_size(fd, groupsize)
  ad.write_int(fd, "NX", NX)
-@@ -28,7 +29,7 @@ ad.close(fd)
+@@ -33,7 +34,7 @@ ad.close(fd)
  ad.finalize()
  
  ## Reading
@@ -594,7 +595,7 @@ Index: adios-1.8.0/wrappers/numpy/tests/test_adios.py
  
  f = ad.file("adios_test.bp")
  f.printself()
-@@ -37,15 +38,15 @@ v = f.var['temperature']
+@@ -42,15 +43,15 @@ v = f.var['temperature']
  v.printself()
  
  val = v.read()
@@ -615,10 +616,10 @@ Index: adios-1.8.0/wrappers/numpy/tests/test_adios.py
 -print "\n>>> Done.\n"
 +print("\n>>> Done.\n")
  
-Index: adios-1.8.0/wrappers/numpy/tests/test_adios_mpi.py
+Index: adios-1.9.0/wrappers/numpy/tests/test_adios_mpi.py
 ===================================================================
---- adios-1.8.0.orig/wrappers/numpy/tests/test_adios_mpi.py
-+++ adios-1.8.0/wrappers/numpy/tests/test_adios_mpi.py
+--- adios-1.9.0.orig/wrappers/numpy/tests/test_adios_mpi.py
++++ adios-1.9.0/wrappers/numpy/tests/test_adios_mpi.py
 @@ -4,7 +4,7 @@ Example:
  
  $ mpiexec -n 4 python ./test_adios_mpi.py
@@ -628,15 +629,16 @@ Index: adios-1.8.0/wrappers/numpy/tests/test_adios_mpi.py
  import adios_mpi as ad
  import numpy as np
  from mpi4py import MPI
-@@ -15,14 +15,14 @@ rank = comm.Get_rank()
+@@ -16,7 +16,7 @@ rank = comm.Get_rank()
  size = comm.Get_size()
  
  ## Writing
 -print "\n>>> Writing ... (rank = %d)\n" % rank
-+print ("\n>>> Writing ... (rank = %d)\n" % rank)
++print ("\n>>> Writing ... (rank = %d)\n" % rank))
  
- ad.init("config_mpi.xml", comm)
- fd = ad.open("temperature", "adios_test_mpi.bp", "w", comm)
+ config = "config_mpi.xml"
+ if len(sys.argv) > 1:
+@@ -27,7 +27,7 @@ fd = ad.open("temperature", "adios_test_
  
  NX = 10
  groupsize =  4 + 4 + 4 + 8 * 1 * NX
@@ -645,7 +647,7 @@ Index: adios-1.8.0/wrappers/numpy/tests/test_adios_mpi.py
  ad.set_group_size(fd, groupsize)
  ad.write_int(fd, "NX", NX)
  ad.write_int(fd, "rank", rank)
-@@ -34,7 +34,7 @@ ad.finalize()
+@@ -39,7 +39,7 @@ ad.finalize()
  
  ## Reading
  if rank == 0:
@@ -654,34 +656,34 @@ Index: adios-1.8.0/wrappers/numpy/tests/test_adios_mpi.py
  
      f = ad.file("adios_test_mpi.bp", comm=MPI.COMM_SELF)
      f.printself()
-@@ -43,17 +43,17 @@ if rank == 0:
+@@ -48,17 +48,17 @@ if rank == 0:
      v.printself()
  
      val = v.read()
 -    print val
-+    print( val)
-     assert (int(sum(sum(val))) == (size*NX-1)*(size*NX)/2)
++    print (val)
+     assert (int(np.sum(val)) == (size*NX-1)*(size*NX)/2)
      f.close()
  
 -print "\n>>> Done.\n"
-+print( "\n>>> Done.\n")
++print ("\n>>> Done.\n")
  
  ## Testing
  if rank == 0:
 -    print "\n>>> Test utility functions ...\n"
-+    print( "\n>>> Test utility functions ...\n")
++    print ("\n>>> Test utility functions ...\n")
  
 -    print "bpls:\n", ad.bpls('adios_test_mpi.bp')
 -    print "readvar:\n", ad.readvar("adios_test_mpi.bp", "temperature")
-+    print( "bpls:\n", ad.bpls('adios_test_mpi.bp'))
-+    print( "readvar:\n", ad.readvar("adios_test_mpi.bp", "temperature"))
++    print ("bpls:\n %s" % ad.bpls('adios_test_mpi.bp'))
++    print ("readvar:\n%s" % ad.readvar("adios_test_mpi.bp", "temperature"))
  
 -    print "\n>>> Done.\n"
-+    print( "\n>>> Done.\n")
-Index: adios-1.8.0/wrappers/numpy/tests/test_adios_timestep.py
++    print ("\n>>> Done.\n")
+Index: adios-1.9.0/wrappers/numpy/tests/test_adios_timestep.py
 ===================================================================
---- adios-1.8.0.orig/wrappers/numpy/tests/test_adios_timestep.py
-+++ adios-1.8.0/wrappers/numpy/tests/test_adios_timestep.py
+--- adios-1.9.0.orig/wrappers/numpy/tests/test_adios_timestep.py
++++ adios-1.9.0/wrappers/numpy/tests/test_adios_timestep.py
 @@ -4,12 +4,12 @@ Example:
  
  $ python ./test_adios.py
@@ -718,32 +720,32 @@ Index: adios-1.8.0/wrappers/numpy/tests/test_adios_timestep.py
 @@ -43,16 +43,16 @@ v.printself()
  
  for i in range(10):
-     val = v.read(from_steps=i)
+     val = v.read(from_steps=i, nsteps=1)
 -    print "step =", i
 -    print val
-+    print ("step =", i)
-+    print( val)
++    print ("step = %s" % i)
++    print (val)
      
  assert ((tt == val).all())
      
  ## Testing
 -print "\n>>> Test utility functions ...\n"
-+print( "\n>>> Test utility functions ...\n")
++print ("\n>>> Test utility functions ...\n")
  
 -print "bpls:\n", ad.bpls('adios_test.bp')
 -print "readvar:\n", ad.readvar("adios_test.bp", "temperature")
-+print("bpls:\n", ad.bpls('adios_test.bp'))
-+print("readvar:\n", ad.readvar("adios_test.bp", "temperature"))
++print ("bpls:\n", ad.bpls('adios_test.bp'))
++print ("readvar:\n", ad.readvar("adios_test.bp", "temperature"))
  
 -print "\n>>> Done.\n"
-+print("\n>>> Done.\n")
++print ("\n>>> Done.\n")
  
-Index: adios-1.8.0/wrappers/numpy/setup.py
+Index: adios-1.9.0/wrappers/numpy/setup.py
 ===================================================================
---- adios-1.8.0.orig/wrappers/numpy/setup.py
-+++ adios-1.8.0/wrappers/numpy/setup.py
-@@ -20,12 +20,14 @@ m1 = Extension('adios',
-                extra_objects = [])
+--- adios-1.9.0.orig/wrappers/numpy/setup.py
++++ adios-1.9.0/wrappers/numpy/setup.py
+@@ -32,12 +32,14 @@ if cmd == None:
+     sys.exit(-1)
  
  p = subprocess.Popen(["adios_config", "-c", "-s"], stdout=subprocess.PIPE)
 -for path in p.communicate()[0].strip().split(" "):
@@ -759,12 +761,12 @@ Index: adios-1.8.0/wrappers/numpy/setup.py
      if path.startswith('-L'):
          m1.library_dirs.append(path.replace('-L', '', 1))
      if path.startswith('-l'):
-Index: adios-1.8.0/wrappers/numpy/setup_mpi.py
+Index: adios-1.9.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
-@@ -20,12 +20,14 @@ m1 = Extension('adios_mpi',
-                extra_objects = [])
+--- adios-1.9.0.orig/wrappers/numpy/setup_mpi.py
++++ adios-1.9.0/wrappers/numpy/setup_mpi.py
+@@ -97,12 +97,14 @@ if cmd == None:
+     sys.exit(-1)
  
  p = subprocess.Popen(["adios_config", "-c"], stdout=subprocess.PIPE)
 -for path in p.communicate()[0].strip().split(" "):
diff --git a/debian/patches/python_wrapper.patch b/debian/patches/python_wrapper.patch
index 79c4603..442abce 100644
--- a/debian/patches/python_wrapper.patch
+++ b/debian/patches/python_wrapper.patch
@@ -3,36 +3,11 @@ Description: Use adios_config in place during build and install
 Last-Updated: 2015-05-20
 Forwarded: not-needed
 
-Index: adios-1.8.0/wrappers/numpy/setup.py
+Index: adios-1.9.0/Makefile.am
 ===================================================================
---- adios-1.8.0.orig/wrappers/numpy/setup.py
-+++ adios-1.8.0/wrappers/numpy/setup.py
-@@ -15,17 +15,17 @@ m1 = Extension('adios',
-                sources=['adios.cpp'], 
-                define_macros=[('_NOMPI', None)],
-                include_dirs = [np.get_include(), '../../src/public'],
--               library_dirs = [],
-+               library_dirs = ['../../debian/tmp/usr/lib'],
-                libraries = [],
-                extra_objects = [])
- 
--p = subprocess.Popen(["adios_config", "-c", "-s"], stdout=subprocess.PIPE)
-+p = subprocess.Popen(["../../adios_config", "-c", "-s"], stdout=subprocess.PIPE)
- pp = p.communicate()[0].decode(encoding='UTF-8').strip()
- for path in str(pp).split(" "):
-     if path.startswith('-I'):
-         m1.include_dirs.append(path.replace('-I', '', 1))
- 
--p = subprocess.Popen(["adios_config", "-l", "-s"], stdout=subprocess.PIPE)
-+p = subprocess.Popen(["../../adios_config", "-l", "-s"], stdout=subprocess.PIPE)
- pp = p.communicate()[0].decode(encoding='UTF-8').strip()
- for path in str(pp).split(" "):
-     if path.startswith('-L'):
-Index: adios-1.8.0/Makefile.am
-===================================================================
---- adios-1.8.0.orig/Makefile.am
-+++ adios-1.8.0/Makefile.am
-@@ -51,7 +51,7 @@ install-data-hook:
+--- adios-1.9.0.orig/Makefile.am
++++ adios-1.9.0/Makefile.am
+@@ -53,7 +53,7 @@ install-data-hook:
  	    echo "GITSTAT=\"git status not available\"" >> adios_git_status; \
  	    echo "Note: git command not found or $(PWD) is not a git repository."; \
  	fi 
@@ -41,17 +16,32 @@ Index: adios-1.8.0/Makefile.am
 +	#$(INSTALL_DATA) adios_config.flags $(DESTDIR)$(sysconfdir)
 +	#$(INSTALL_DATA) adios_git_status $(DESTDIR)$(sysconfdir)
          
- CLEANFILES = adios_config adios_config.flags
-Index: adios-1.8.0/wrappers/numpy/setup_mpi.py
+ CLEANFILES = 
+Index: adios-1.9.0/wrappers/numpy/setup_mpi.py
+===================================================================
+--- adios-1.9.0.orig/wrappers/numpy/setup_mpi.py
++++ adios-1.9.0/wrappers/numpy/setup_mpi.py
+@@ -27,8 +27,8 @@ def _do_usage():
+   sys.exit(0)
+ 
+ # Default option values
+-include_dirs = [np.get_include(), '../../src/public'],
+-library_dirs = []
++include_dirs = ['../../src/public'],
++library_dirs = ['../../debian/tmp/usr/lib'],
+ extra_compile_args = []
+ extra_link_args = []
+ 
+Index: adios-1.9.0/wrappers/numpy/setup.py
 ===================================================================
---- adios-1.8.0.orig/wrappers/numpy/setup_mpi.py
-+++ adios-1.8.0/wrappers/numpy/setup_mpi.py
-@@ -15,7 +15,7 @@ m1 = Extension('adios_mpi',
-                sources=['adios_mpi.cpp'], 
-                define_macros=[],
+--- adios-1.9.0.orig/wrappers/numpy/setup.py
++++ adios-1.9.0/wrappers/numpy/setup.py
+@@ -18,7 +18,7 @@ m1 = Extension('adios',
+                sources=['adios.cpp'], 
+                define_macros=[('_NOMPI', None)],
                 include_dirs = [np.get_include(), '../../src/public'],
 -               library_dirs = [],
 +               library_dirs = ['../../debian/tmp/usr/lib'],
                 libraries = [],
-                extra_objects = [])
- 
+                extra_objects = [],
+                extra_compile_args = ['-Wno-uninitialized',

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



More information about the debian-science-commits mailing list