[flann] 14/21: Finally drop patch

[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 b14378a6e3220e9a3ef70835e81d981dfb3735ca
Author: Leopold Palomo-Avellaneda <leo at alaxarxa.net>
Date:   Fri Jul 15 14:48:20 2016 +0200

    Finally drop patch
---
 debian/patches/fixmultiarchlibinstall.patch | 16 ----------------
 debian/patches/series                       |  1 -
 2 files changed, 17 deletions(-)

diff --git a/debian/patches/fixmultiarchlibinstall.patch b/debian/patches/fixmultiarchlibinstall.patch
deleted file mode 100644
index e18c729..0000000
--- a/debian/patches/fixmultiarchlibinstall.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Allow multi-arch lib installation
-Author: Mathieu Malaterre <malat at debian.org>
-Forwarded: no
-
---- flann-1.8.3.orig/cmake/flann_utils.cmake
-+++ flann-1.8.3/cmake/flann_utils.cmake
-@@ -1,6 +1,8 @@
- macro(GET_OS_INFO)
-     string(REGEX MATCH "Linux" OS_IS_LINUX ${CMAKE_SYSTEM_NAME})
--    set(FLANN_LIB_INSTALL_DIR "lib")
-+    if(NOT DEFINED FLANN_LIB_INSTALL_DIR)
-+      set(FLANN_LIB_INSTALL_DIR "lib")
-+    endif()
-     set(FLANN_INCLUDE_INSTALL_DIR
-         "include/${PROJECT_NAME_LOWER}-${FLANN_MAJOR_VERSION}.${FLANN_MINOR_VERSION}")
- endmacro(GET_OS_INFO)
diff --git a/debian/patches/series b/debian/patches/series
index 05bf86d..9612cdd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 0001-Updated-fix-cmake-hdf5.patch
-fixmultiarchlibinstall.patch

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