Bug#756472: gmsh: diff for NMU version 2.8.5+dfsg-1.1

[Gilles Filippini]

tags 756472 + pending
thanks

Dear maintainer,

Because gmsh is in the way of the HDF5 1.8.13 transition I've prepared
an NMU (versioned as 2.8.5+dfsg-1.1) and uploaded it to DELAYED/5.
Please feel free to tell me if I should delay it longer.

Regards.

_g.

diff -Nru gmsh-2.8.5+dfsg/debian/changelog gmsh-2.8.5+dfsg/debian/changelog
--- gmsh-2.8.5+dfsg/debian/changelog	2014-07-25 22:24:06.000000000 +0200
+++ gmsh-2.8.5+dfsg/debian/changelog	2014-08-06 08:40:17.000000000 +0200
@@ -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 -Nru gmsh-2.8.5+dfsg/debian/patches/fix-cmake-hdf5.patch gmsh-2.8.5+dfsg/debian/patches/fix-cmake-hdf5.patch
--- gmsh-2.8.5+dfsg/debian/patches/fix-cmake-hdf5.patch	1970-01-01 01:00:00.000000000 +0100
+++ gmsh-2.8.5+dfsg/debian/patches/fix-cmake-hdf5.patch	2014-08-06 08:41:01.000000000 +0200
@@ -0,0 +1,29 @@
+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 -Nru gmsh-2.8.5+dfsg/debian/patches/series gmsh-2.8.5+dfsg/debian/patches/series
--- gmsh-2.8.5+dfsg/debian/patches/series	2014-07-25 22:21:43.000000000 +0200
+++ gmsh-2.8.5+dfsg/debian/patches/series	2014-08-06 08:39:24.000000000 +0200
@@ -8,3 +8,4 @@
 fix_script_header.patch
 fix_java_wrapper_compilation.patch
 enable_tetgen.patch
+fix-cmake-hdf5.patch