[ompl] 07/18: Rebasing patches

[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 ompl.

commit 81f30afdd90124b3adcde874b1e67a2357de96a7
Author: Leopold Palomo-Avellaneda <leo at alaxarxa.net>
Date:   Fri Jan 27 12:35:53 2017 +0100

    Rebasing patches
---
 ...d-functionality-to-findflann-search-macro.patch | 21 ++++++++++++++++++
 ...0001-Disabling-installPyPlusPlus.sh-stuff.patch | 25 ----------------------
 .../0002-Added-FLANN_LIBRARIES-dependency.patch    | 22 +++++++++++++++++++
 .../0002-Fixup-pkgconfig-for-multiarch.patch       | 22 -------------------
 debian/patches/series                              |  6 ++----
 5 files changed, 45 insertions(+), 51 deletions(-)

diff --git a/debian/patches/0001-Add-functionality-to-findflann-search-macro.patch b/debian/patches/0001-Add-functionality-to-findflann-search-macro.patch
new file mode 100644
index 0000000..3c69684
--- /dev/null
+++ b/debian/patches/0001-Add-functionality-to-findflann-search-macro.patch
@@ -0,0 +1,21 @@
+From: Leopold Palomo-Avellaneda <leo at alaxarxa.net>
+Date: Tue, 30 Aug 2016 12:17:15 +0200
+Subject: Add functionality to findflann search macro
+
+---
+ CMakeModules/Findflann.cmake | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/CMakeModules/Findflann.cmake b/CMakeModules/Findflann.cmake
+index 3b3f6dc..033e28c 100644
+--- a/CMakeModules/Findflann.cmake
++++ b/CMakeModules/Findflann.cmake
+@@ -1,5 +1,8 @@
+ # Find FLANN, a Fast Library for Approximate Nearest Neighbors
+ 
++find_package(PkgConfig)
++pkg_check_modules(FLANN REQUIRED flann)
++
+ include(FindPackageHandleStandardArgs)
+ 
+ find_path(FLANN_INCLUDE_DIR flann.hpp PATH_SUFFIXES flann)
diff --git a/debian/patches/0001-Disabling-installPyPlusPlus.sh-stuff.patch b/debian/patches/0001-Disabling-installPyPlusPlus.sh-stuff.patch
deleted file mode 100644
index 47db28c..0000000
--- a/debian/patches/0001-Disabling-installPyPlusPlus.sh-stuff.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From: Leopold Palomo-Avellaneda <leopold.palomo at upc.edu>
-Date: Wed, 27 Apr 2016 08:44:13 +0200
-Subject: Disabling installPyPlusPlus.sh stuff
-
----
- src/CMakeLists.txt | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 4cf8ab7..cffbd5f 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -37,8 +37,8 @@ if(WIN32)
-     add_custom_target(installpyplusplus
-         COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/external/installPyPlusPlus.bat" VERBATIM)
- else(WIN32)
--    configure_file("${CMAKE_CURRENT_SOURCE_DIR}/external/installPyPlusPlus.sh.in"
--        "${CMAKE_CURRENT_SOURCE_DIR}/external/installPyPlusPlus.sh" @ONLY)
--    add_custom_target(installpyplusplus
--        COMMAND "sh" "${CMAKE_CURRENT_SOURCE_DIR}/external/installPyPlusPlus.sh")
-+#    configure_file("${CMAKE_CURRENT_SOURCE_DIR}/external/installPyPlusPlus.sh.in"
-+#        "${CMAKE_CURRENT_SOURCE_DIR}/external/installPyPlusPlus.sh" @ONLY)
-+#    add_custom_target(installpyplusplus
-+#        COMMAND "sh" "${CMAKE_CURRENT_SOURCE_DIR}/external/installPyPlusPlus.sh")
- endif(WIN32)
diff --git a/debian/patches/0002-Added-FLANN_LIBRARIES-dependency.patch b/debian/patches/0002-Added-FLANN_LIBRARIES-dependency.patch
new file mode 100644
index 0000000..77978cf
--- /dev/null
+++ b/debian/patches/0002-Added-FLANN_LIBRARIES-dependency.patch
@@ -0,0 +1,22 @@
+From: Leopold Palomo-Avellaneda <leo at alaxarxa.net>
+Date: Tue, 30 Aug 2016 12:18:55 +0200
+Subject: Added FLANN_LIBRARIES dependency
+
+---
+ CMakeModules/OMPLUtils.cmake | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeModules/OMPLUtils.cmake b/CMakeModules/OMPLUtils.cmake
+index 6296cd7..beb7988 100644
+--- a/CMakeModules/OMPLUtils.cmake
++++ b/CMakeModules/OMPLUtils.cmake
+@@ -6,7 +6,8 @@ macro(add_ompl_test test_name)
+     ${Boost_SERIALIZATION_LIBRARY}
+     ${Boost_FILESYSTEM_LIBRARY}
+     ${Boost_SYSTEM_LIBRARY}
+-    ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
++    ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}
++    ${FLANN_LIBRARIES})
+   add_test(NAME ${test_name} COMMAND $<TARGET_FILE:${test_name}>)
+ endmacro(add_ompl_test)
+ 
diff --git a/debian/patches/0002-Fixup-pkgconfig-for-multiarch.patch b/debian/patches/0002-Fixup-pkgconfig-for-multiarch.patch
deleted file mode 100644
index f6b5103..0000000
--- a/debian/patches/0002-Fixup-pkgconfig-for-multiarch.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
-Date: Wed, 27 Apr 2016 08:44:13 +0200
-Subject: Fixup-pkgconfig-for-multiarch
-
-===================================================================
----
- CMakeModules/ompl.pc.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeModules/ompl.pc.in b/CMakeModules/ompl.pc.in
-index 04fd20c..291380c 100644
---- a/CMakeModules/ompl.pc.in
-+++ b/CMakeModules/ompl.pc.in
-@@ -1,7 +1,7 @@
- # This file was generated by CMake for @PROJECT_NAME@
- prefix=@CMAKE_INSTALL_PREFIX@
- exec_prefix=${prefix}
--libdir=${prefix}/lib
-+libdir=${prefix}/lib/@CMAKE_LIBRARY_ARCHITECTURE@
- includedir=${prefix}/include
- 
- Name: @PKG_NAME@
diff --git a/debian/patches/series b/debian/patches/series
index d0ff699..97051fa 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,2 @@
-0001-Disabling-installPyPlusPlus.sh-stuff.patch
-0002-Fixup-pkgconfig-for-multiarch.patch
-0003-Add-functionality-to-findflann-search-macro.patch
-0004-Added-FLANN_LIBRARIES-dependency.patch
+0001-Add-functionality-to-findflann-search-macro.patch
+0002-Added-FLANN_LIBRARIES-dependency.patch
\ No newline at end of file

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