[adios] 14/18: Update version-fix.patch

[Alastair McKinstry]

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

mckinstry pushed a commit to tag debian/1.10.1-1
in repository adios.

commit 8fdb70ce00fff8571acb50a31889ad3130140656
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Sat Oct 22 13:06:30 2016 +0100

    Update version-fix.patch
---
 debian/patches/libc-2.23-fixes.patch | 13 -------------
 debian/patches/series                |  7 +------
 debian/patches/version-fix.patch     | 29 ++++++++++++++++-------------
 3 files changed, 17 insertions(+), 32 deletions(-)

diff --git a/debian/patches/libc-2.23-fixes.patch b/debian/patches/libc-2.23-fixes.patch
deleted file mode 100644
index 81de2af..0000000
--- a/debian/patches/libc-2.23-fixes.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: adios-1.9.0/src/core/adios_internals.c
-===================================================================
---- adios-1.9.0.orig/src/core/adios_internals.c
-+++ adios-1.9.0/src/core/adios_internals.c
-@@ -4967,7 +4967,7 @@ int adios_generate_var_characteristics_v
-         size = 0; \
-         while ((size * b) < total_size) \
-         { \
--            if (isnan (data [size]) || !isfinite (data [size])) {\
-+	  if (isnan ((double) data [size]) || !isfinite ((double) data [size])) { \
-                 size ++; \
-                 continue; \
-             }\
diff --git a/debian/patches/series b/debian/patches/series
index 287410c..c770bbf 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,8 +1,5 @@
-#sh4.patch
 mpi_in_place.patch
-#security.patch
 netcdf-fix.patch
-#python3.patch
 debian_paths.patch
 mpi4py_fix.patch
 pkgconfig.patch
@@ -11,7 +8,5 @@ numpy_paths.patch
 exclude_cmake.patch
 python_wrapper.patch
 #multiarch_safe.patch
-#py3.patch
-#version-fix.patch
-#libc-2.23-fixes.patch
+version-fix.patch
 gcc6-fixes.patch
diff --git a/debian/patches/version-fix.patch b/debian/patches/version-fix.patch
index 98ee690..dec4f72 100644
--- a/debian/patches/version-fix.patch
+++ b/debian/patches/version-fix.patch
@@ -1,18 +1,21 @@
 Author: Alastair McKinstry <mckinstry at debian.org>
 Description: Fix for incorrect version number
-Last-Updated: 2015-10-26
+Last-Updated: 2016-10-22
 Forwarded: no
 
-Index: adios-1.9.0/wrappers/numpy/setup.py
+Index: adios-1.10.1/wrappers/numpy/src/__init__.py
 ===================================================================
---- adios-1.9.0.orig/wrappers/numpy/setup.py
-+++ adios-1.9.0/wrappers/numpy/setup.py
-@@ -69,7 +69,7 @@ class adios_test(Command):
-         test_runner.run(test_suite)
- 
- setup(name = 'adios',
--      version = '1.8.1b3',
-+      version = '1.9.0',
-       description = 'Python Module for Adios',
-       author = 'Jong Choi',
-       author_email = 'yyalli at gmail.com',
+--- adios-1.10.1.orig/wrappers/numpy/src/__init__.py
++++ adios-1.10.1/wrappers/numpy/src/__init__.py
+@@ -1,2 +1,2 @@
+ from .adios import *
+-__version__ = '1.9.1b19'
++__version__ = '1.10.1'
+Index: adios-1.10.1/wrappers/numpy/src_mpi/__init__.py
+===================================================================
+--- adios-1.10.1.orig/wrappers/numpy/src_mpi/__init__.py
++++ adios-1.10.1/wrappers/numpy/src_mpi/__init__.py
+@@ -1,2 +1,2 @@
+ from .adios_mpi import *
+-__version__ = '1.9.1b19'
++__version__ = '1.10.1'

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