[flann] 04/21: Imported Gilles Filippini <pini at debian.org> changes of 1.8.4-4.1

[Leopold Palomo-Avellaneda]

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

lepalom-guest pushed a commit to branch master
in repository flann.

commit 96ba416e25d03188ec633e10fa40db130c85353e
Author: Leopold Palomo-Avellaneda <leopold.palomo at upc.edu>
Date:   Fri Jul 15 12:55:14 2016 +0200

    Imported Gilles Filippini <pini at debian.org> changes of 1.8.4-4.1
---
 debian/changelog                    |  8 +++++++
 debian/patches/fix-cmake-hdf5.patch | 44 +++++++++++++++++++++++++++++++++++++
 debian/patches/series               |  1 +
 3 files changed, 53 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index c1ee3ef..cb8e52e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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 --git a/debian/patches/fix-cmake-hdf5.patch b/debian/patches/fix-cmake-hdf5.patch
new file mode 100644
index 0000000..688c48f
--- /dev/null
+++ b/debian/patches/fix-cmake-hdf5.patch
@@ -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 --git a/debian/patches/series b/debian/patches/series
index 903f210..57908a3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 remove_tests.patch
 fixmultiarchlibinstall.patch
+fix-cmake-hdf5.patch

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