Bug#756471: flann: diff for NMU version 1.8.4-4.1

[Gilles Filippini]

tags 756471 + pending
thanks

Dear maintainer,

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

Regards.

_g.

diff -Nru flann-1.8.4/debian/changelog flann-1.8.4/debian/changelog
--- flann-1.8.4/debian/changelog	2014-06-17 10:58:18.000000000 +0200
+++ flann-1.8.4/debian/changelog	2014-08-06 08:35:05.000000000 +0200
@@ -1,3 +1,11 @@
+flann (1.8.4-4.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * New patch fix-cmake-hdf5.patch to support hdf5 1.8.13 new packaging
+    layout (closes: #756471).
+
+ -- Gilles Filippini <pini at debian.org>  Wed, 06 Aug 2014 08:33:53 +0200
+
 flann (1.8.4-4) unstable; urgency=low
 
   * Bump Std-Vers to 3.9.5, no changes needed. Run w-a-s for cleanup.
diff -Nru flann-1.8.4/debian/patches/fix-cmake-hdf5.patch flann-1.8.4/debian/patches/fix-cmake-hdf5.patch
--- flann-1.8.4/debian/patches/fix-cmake-hdf5.patch	1970-01-01 01:00:00.000000000 +0100
+++ flann-1.8.4/debian/patches/fix-cmake-hdf5.patch	2014-08-06 08:33:43.000000000 +0200
@@ -0,0 +1,44 @@
+Index: flann-1.8.4/CMakeLists.txt
+===================================================================
+--- flann-1.8.4.orig/CMakeLists.txt	2014-07-24 16:52:23.000000000 +0200
++++ flann-1.8.4/CMakeLists.txt	2014-07-24 19:52:39.193104490 +0200
+@@ -71,11 +71,11 @@
+     set(BUILD_PYTHON_BINDINGS OFF)
+ endif()
+ 
+-find_hdf5()
++find_package(HDF5)
+ if (NOT HDF5_FOUND)
+ 	message(WARNING "hdf5 library not found, some tests will not be run")
+ else()
+-    include_directories(${HDF5_INCLUDE_DIR})
++    include_directories(${HDF5_INCLUDE_DIRS})
+ endif()
+ 
+ if (USE_MPI OR HDF5_IS_PARALLEL)
+Index: flann-1.8.4/examples/CMakeLists.txt
+===================================================================
+--- flann-1.8.4.orig/examples/CMakeLists.txt	2013-01-15 22:38:32.000000000 +0100
++++ flann-1.8.4/examples/CMakeLists.txt	2014-07-24 19:52:04.463947527 +0200
+@@ -11,7 +11,7 @@
+ endif()
+ 
+ if (HDF5_FOUND)
+-    include_directories(${HDF5_INCLUDE_DIR})
++    include_directories(${HDF5_INCLUDE_DIRS})
+ 
+     add_executable(flann_example_cpp flann_example.cpp)
+     target_link_libraries(flann_example_cpp ${HDF5_LIBRARIES})
+Index: flann-1.8.4/test/CMakeLists.txt
+===================================================================
+--- flann-1.8.4.orig/test/CMakeLists.txt	2013-01-15 22:38:32.000000000 +0100
++++ flann-1.8.4/test/CMakeLists.txt	2014-07-24 19:52:12.668222600 +0200
+@@ -20,7 +20,7 @@
+ endif()
+ 
+ if (GTEST_FOUND AND HDF5_FOUND)
+-	include_directories(${HDF5_INCLUDE_DIR})
++	include_directories(${HDF5_INCLUDE_DIRS})
+ 
+     set(TEST_LIBRARIES "${HDF5_LIBRARIES}")
+     if (HDF5_IS_PARALLEL)
diff -Nru flann-1.8.4/debian/patches/series flann-1.8.4/debian/patches/series
--- flann-1.8.4/debian/patches/series	2013-01-19 19:23:17.000000000 +0100
+++ flann-1.8.4/debian/patches/series	2014-08-06 08:33:43.000000000 +0200
@@ -1,2 +1,3 @@
 remove_tests.patch
 fixmultiarchlibinstall.patch
+fix-cmake-hdf5.patch