[xmds2] 08/09: Drop patch wscript-hdf5.patch (applied upstream)

[Rafael Laboissière]

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

rlaboiss-guest pushed a commit to branch master
in repository xmds2.

commit 6bd5890143de903567e254f8873c5ecb8df0d03e
Author: Rafael Laboissiere <rafael at laboissiere.net>
Date:   Tue Sep 30 22:03:29 2014 -0300

    Drop patch wscript-hdf5.patch (applied upstream)
---
 debian/patches/series             |  1 -
 debian/patches/wscript-hdf5.patch | 57 ---------------------------------------
 2 files changed, 58 deletions(-)

diff --git a/debian/patches/series b/debian/patches/series
index 22c6307..cadaff9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 revision-number-as-deb-pkg.patch
-wscript-hdf5.patch
diff --git a/debian/patches/wscript-hdf5.patch b/debian/patches/wscript-hdf5.patch
deleted file mode 100644
index 9c43f51..0000000
--- a/debian/patches/wscript-hdf5.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-Description: Use h5cc for getting the compilation flags for the HDF5 library
-Author: Gilles Filippini <pini at debian.org>
-Reviewed-by: Rafael Laboissiere <rafael at laboissiere.net>
-Forwarded: http://sourceforge.net/p/xmds/mailman/message/32851135/
-Last-Update: 2014-09-20
-  
---- xmds2-2.2.0+dfsg1.orig/xpdeint/support/wscript
-+++ xmds2-2.2.0+dfsg1/xpdeint/support/wscript
-@@ -361,39 +361,15 @@
-             msg = "Checking for /dev/urandom",
-         )
-         
--        # Check for zlib, used by hdf5
--        check_cxx(
--            lib='z',
--            function_name="deflate",
--            header_name="zlib.h",
--            uselib_store="zlib",
--            msg = "Checking for zlib"
--        )
--        
--        check_cxx(
--            lib='hdf5',
--            header_name="hdf5.h",
--            function_name="H5check_version",
--            uselib_store="hdf5",
--            uselib="zlib" if "zlib" in conf.env['uselib'] else [],
--            msg = "Checking for HDF5",
--        )
--        
--        if 'hdf5' in conf.env['uselib']:
--            check_cxx(
--                lib='hdf5_hl',
--                defines='HAVE_HDF5_HL',
--                header_name=['hdf5.h', 'hdf5_hl.h'],
--                function_name='H5DSset_scale',
--                uselib_store='hdf5',
--                uselib='hdf5',
--                msg = "Checking for HDF5 High-level library",
--            )
--            
--            # We need to reverse the library order because hdf5_hl depends on hdf5
--            if conf.env['STLIB_hdf5']: conf.env['STLIB_hdf5'] = list(reversed(conf.env.get_flat('STLIB_hdf5').split()))
--            if conf.env['SHLIB_hdf5']: conf.env['SHLIB_hdf5'] = list(reversed(conf.env.get_flat('SHLIB_hdf5').split()))
--            
-+        # Check for hdf5
-+        try:
-+            conf.find_program('h5cc', var='H5CC')
-+        except  conf.errors.ConfigurationError:
-+            conf.find_program('h5pcc', var='H5CC')
-+        ret = conf.cmd_and_log([conf.env['H5CC'], '-show', '-shlib'])
-+        conf.parse_flags(ret, 'hdf5')
-+        if conf.env['LIB_hdf5']:
-+            conf.env.append_unique('uselib', 'hdf5')
-             check_cxx(
-                 header_name=['hdf5.h'],
-                 defines='HAVE_H5LEXISTS',

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