Source: flann
Version: 1.8.4-4
Severity: normal
Tags: patch
User: p...@debian.org
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
Hi,
Please find attached a patch proposal to fix cmake HDF5 detection when
it isn't installed in the standard path.
This patch fixes a FTBFS against hdf5 1.8.13 currently in experimental.
Thanks in advance,
_g.
- -- System Information:
Debian Release: jessie/sid
APT prefers testing
APT policy: (500, 'testing'), (1, 'experimental')
Architecture: i386 (i686)
Kernel: Linux 3.14-1-486
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQEcBAEBCAAGBQJT2KAXAAoJEO/obGx//s+DnCwH/1kErKqQqz58EITu9MuyrCvx
U6fmoUg7u8G0xr40A4DDqG4MXZ9HBSYQNDc8tf2kHhZ3eTqAypTA+RfCT6g/3Kw6
rt2YceJw6VFLFzUzhaxamv16xUZdQvwuAFfGuXqDBhZY6l9+At8gy/DWBRxP6NAL
tVJRbu5wn/q7HQpSmRR7fUauyolvWykJ8J857IHjkn5diYpG0hs0tgseYaHM7gWb
fiXQRIhmw0VYPQP5/T4KgmkouD/bUa5axL7VlEsYY9o4+5uNSqEr5yAO1vBhs1jI
o4D5K8CPxXcUAEWC4TwEESL3fvkVF2ZLDG81RVGbtCBwm3uuMGDNHYFq1uFNjJ0=
=59oB
-----END PGP SIGNATURE-----
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-07-24 19:46:48.000000000 +0200
@@ -1,3 +1,11 @@
+flann (1.8.4-4.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * New patch fix-cmake-hdf5.patch to support hdf5 1.8.13 new packaging
+ layout.
+
+ -- Gilles Filippini <p...@debian.org> Thu, 24 Jul 2014 19:46:48 +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-07-24 19:52:42.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-07-24 19:45:59.000000000 +0200
@@ -1,2 +1,3 @@
remove_tests.patch
fixmultiarchlibinstall.patch
+fix-cmake-hdf5.patch
--
debian-science-maintainers mailing list
debian-science-maintainers@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-science-maintainers
