[gmsh] 01/01: Add support hdf5 1.8.13.

[Anton Gladky]

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

gladk pushed a commit to branch master
in repository gmsh.

commit 95c97092e4d1c1378432a9db76f453c5bcdd4b8a
Author: Gilles Filippini <pini at debian.org>
Date:   Tue Aug 12 23:37:02 2014 +0200

    Add support hdf5 1.8.13.
---
 debian/changelog                    |  8 ++++++++
 debian/patches/fix-cmake-hdf5.patch | 33 +++++++++++++++++++++++++++++++++
 debian/patches/series               |  1 +
 3 files changed, 42 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index f1d39cf..446271a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+gmsh (2.8.5+dfsg-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * New patch fix-cmake-hdf5.patch to support hdf5 1.8.13 new packaging
+    layout (closes: #756472).
+
+ -- Gilles Filippini <pini at debian.org>  Fri, 25 Jul 2014 00:43:50 +0200
+
 gmsh (2.8.5+dfsg-1) unstable; urgency=medium
 
   * [6fbfd92] Add Files-Excluded into d/copyright
diff --git a/debian/patches/fix-cmake-hdf5.patch b/debian/patches/fix-cmake-hdf5.patch
new file mode 100644
index 0000000..b547832
--- /dev/null
+++ b/debian/patches/fix-cmake-hdf5.patch
@@ -0,0 +1,33 @@
+Description: Add support hdf5 1.8.13
+Author: Gilles Filippini <pini at debian.org>
+Last-Update: 2014-07-25
+
+Index: gmsh-2.8.5+dfsg/CMakeLists.txt
+===================================================================
+--- gmsh-2.8.5+dfsg.orig/CMakeLists.txt
++++ gmsh-2.8.5+dfsg/CMakeLists.txt
+@@ -783,8 +783,10 @@ if(ENABLE_FOURIER_MODEL)
+ endif(ENABLE_FOURIER_MODEL)
+ 
+ if(ENABLE_MED OR ENABLE_CGNS)
+-  find_library(HDF5_LIB hdf5)
+-  if(HDF5_LIB)
++  find_package(HDF5)
++  if(HDF5_FOUND)
++    set(HDF5_LIB "${HDF5_C_LIBRARIES}")
++    list(APPEND EXTERNAL_INCLUDES ${HDF5_INCLUDE_DIRS})
+     if(ENABLE_MED)
+       find_library(MED_LIB med)
+       if(MED_LIB)
+@@ -815,9 +817,9 @@ if(ENABLE_MED OR ENABLE_CGNS)
+         endif(ZLIB_FOUND)
+       endif(NOT HAVE_LIBZ)
+     endif(MED_LIB OR CGNS_LIB)
+-  else(HDF5_LIB)
++  else(HDF5_FOUND)
+     message(STATUS "HDF5 not found")
+-  endif(HDF5_LIB)
++  endif(HDF5_FOUND)
+ endif(ENABLE_MED OR ENABLE_CGNS)
+ 
+ if(HAVE_SOLVER)
diff --git a/debian/patches/series b/debian/patches/series
index a251b18..5670ff0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,3 +8,4 @@ fix_libdir.patch
 fix_script_header.patch
 fix_java_wrapper_compilation.patch
 enable_tetgen.patch
+fix-cmake-hdf5.patch

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