[adios] 05/07: rm obsolete patches

[Alastair McKinstry]

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

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

commit 8afa12f5f78ebe51263df20a383c32795b0b5de3
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Mon Nov 21 15:27:06 2016 +0000

    rm obsolete patches
---
 debian/changelog                               |  3 +++
 debian/patches/series                          |  1 -
 debian/patches/type-bool-already-defined.patch | 17 -----------------
 debian/patches/version-fix.patch               | 21 ---------------------
 4 files changed, 3 insertions(+), 39 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a56dde0..c6b130d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
 adios (1.11.0-1) UNRELEASED; urgency=medium
 
   * New upstream release
+  * Obsolete patches: 
+    - typedef-bool-already-defined.patch
+    - version-fix.patch
 
  -- Alastair McKinstry <mckinstry at debian.org>  Mon, 21 Nov 2016 13:11:27 +0000
 
diff --git a/debian/patches/series b/debian/patches/series
index 8087bac..25ebc84 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,4 +6,3 @@ pkgconfig.patch
 numpy_paths.patch
 exclude_cmake.patch
 python_wrapper.patch
-type-bool-already-defined.patch
diff --git a/debian/patches/type-bool-already-defined.patch b/debian/patches/type-bool-already-defined.patch
deleted file mode 100644
index bfc2d9b..0000000
--- a/debian/patches/type-bool-already-defined.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: HDF5 1.10 defines type bool
-Author: Gilles Filippini <pini at debian.org>
-Index: adios-1.9.0/utils/bp2h5/bp2h5.c
-===================================================================
---- adios-1.9.0.orig/utils/bp2h5/bp2h5.c
-+++ adios-1.9.0/utils/bp2h5/bp2h5.c
-@@ -43,7 +43,9 @@
- #include "dmalloc.h"
- #endif
- 
--typedef int bool;
-+#ifndef bool
-+typedef int bool;
-+#endif
- #define false 0
- #define true  1
- 
diff --git a/debian/patches/version-fix.patch b/debian/patches/version-fix.patch
deleted file mode 100644
index dec4f72..0000000
--- a/debian/patches/version-fix.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Author: Alastair McKinstry <mckinstry at debian.org>
-Description: Fix for incorrect version number
-Last-Updated: 2016-10-22
-Forwarded: no
-
-Index: adios-1.10.1/wrappers/numpy/src/__init__.py
-===================================================================
---- 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