...
 
Commits (2)
Description: <short summary of the patch>
TODO: Put a short summary on the line above and replace this paragraph
with a longer explanation of this change. Complete the meta-information
with other relevant fields (see below for details). To make it easier, the
information below has been extracted from the changelog. Adjust it or drop
it.
.
hugin (2018.0.0+dfsg-2) unstable; urgency=low
.
* Drop get-orig-source target and add Files-Excluded stanza to
debian/copyright, delegating the heavy lifting to uscan.
* Delete superfluous --parallel argument to dh.
* Fix a couple of syntax errors in debian/copyright.
* Point vcs* to salsa.
* Set Rules-Requires-Root: no.
* Point $HOME and $XDG_RUNTIME_DIR to temporary dir in autopkgtest.
Closes: #903268
* Fix space-in-std-shortname-in-dep5-copyright lintian warning.
Author: Andreas Metzler <ametzler@debian.org>
Bug-Debian: https://bugs.debian.org/903268
---
The information above should follow the Patch Tagging Guidelines, please
checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
are templates for supplementary fields that you might want to add:
Origin: <vendor|upstream|other>, <url of original patch>
Bug: <url in upstream bugtracker>
Bug-Debian: https://bugs.debian.org/<bugnumber>
Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
Forwarded: <no|not-needed|url proving that it has been forwarded>
Reviewed-By: <name and email of someone who approved the patch>
Last-Update: 2018-10-14
--- hugin-2018.0.0+dfsg.orig/CMakeModules/FindFLANN.cmake
+++ hugin-2018.0.0+dfsg/CMakeModules/FindFLANN.cmake
@@ -9,17 +9,14 @@
# FLANN_FOUND
-find_path(FLANN_INCLUDE_DIRS flann/flann.hpp)
+find_package(PkgConfig QUIET)
+pkg_check_modules(FLANN flann)
-if(FLANN_INCLUDE_DIRS)
- find_library(FLANN_LIBRARIES flann_cpp)
- if(FLANN_LIBRARIES)
+if(FLANN_FOUND)
MESSAGE(STATUS "flann library found")
- set(FLANN_FOUND "YES")
- endif(FLANN_LIBRARIES)
-else(FLANN_INCLUDE_DIRS)
+else(FLANN_FOUND)
message(STATUS "flann library not found. falling back to included copy")
set(FLANN_LIBRARIES "flann_cpp")
set(FLANN_INCLUDE_DIRS "${CMAKE_SOURCE_DIR}/src/foreign")
-endif(FLANN_INCLUDE_DIRS)
+endif(FLANN_FOUND)
43_fallbackhelp.patch
fix_flann_find.patch