[otb] 06/13: Drop patches, applied/included upstream.

[Bas Couwenberg]

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

sebastic pushed a commit to branch master
in repository otb.

commit d42301955271d075377684847245a993a01f7b5f
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Wed Oct 4 21:10:00 2017 +0200

    Drop patches, applied/included upstream.
---
 debian/changelog                                   |  1 +
 ...1419-FindOpenCV.cmake-supports-multiarch-.patch | 26 ----------------------
 debian/patches/cmake-3.9.0.patch                   | 15 -------------
 debian/patches/series                              |  2 --
 4 files changed, 1 insertion(+), 43 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ea91b1c..04c7c85 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ otb (6.2.0~rc1+dfsg-1) UNRELEASED; urgency=medium
   * Bump Standards-Version to 4.1.1, no changes.
   * Add lintian override for python-foo-but-no-python3-foo.
   * Bump minimum required CMake to 3.1.0.
+  * Drop patches, applied/included upstream.
 
  -- Bas Couwenberg <sebastic at debian.org>  Wed, 04 Oct 2017 20:42:08 +0200
 
diff --git a/debian/patches/0001-BUG-Mantis-1419-FindOpenCV.cmake-supports-multiarch-.patch b/debian/patches/0001-BUG-Mantis-1419-FindOpenCV.cmake-supports-multiarch-.patch
deleted file mode 100644
index 270ffba..0000000
--- a/debian/patches/0001-BUG-Mantis-1419-FindOpenCV.cmake-supports-multiarch-.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Description: Support Multi-Arch paths in FindOpenCV.cmake.
-Author: Guillaume Pasero <guillaume.pasero at c-s.fr>
-Origin: https://git.orfeo-toolbox.org/otb.git/commit/f0541d761ee69f3300d0cdfd3c869140bec29c2d
-Bug: https://bugs.orfeo-toolbox.org/view.php?id=1419
-Bug-Debian: https://bugs.debian.org/865414
-
---- a/CMake/FindOpenCV.cmake
-+++ b/CMake/FindOpenCV.cmake
-@@ -116,7 +116,7 @@ find_library(
-   OPENCV_core_LIBRARY
-   NAMES ${opencv_core_NAMES}
-   PATHS ${OPENCV_SEARCH_PATH}
--  PATH_SUFFIXES "lib" "lib64" "lib/x86_64-linux-gnu"
-+  PATH_SUFFIXES "lib" "lib64" "lib/${CMAKE_LIBRARY_ARCHITECTURE}"
-   NO_DEFAULT_PATH
-   DOC "Path to opencv_core library")
- 
-@@ -124,7 +124,7 @@ find_library(
-   OPENCV_ml_LIBRARY
-   NAMES ${opencv_ml_NAMES}
-   PATHS ${OPENCV_SEARCH_PATH}
--  PATH_SUFFIXES "lib" "lib64" "lib/x86_64-linux-gnu"
-+  PATH_SUFFIXES "lib" "lib64" "lib/${CMAKE_LIBRARY_ARCHITECTURE}"
-   NO_DEFAULT_PATH
-   DOC "Path to opencv_ml library")
- 
diff --git a/debian/patches/cmake-3.9.0.patch b/debian/patches/cmake-3.9.0.patch
deleted file mode 100644
index d038be6..0000000
--- a/debian/patches/cmake-3.9.0.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: Fix build failure with CMake 3.9.0.
-Author: Bas Couwenberg <sebastic at debian.org>
-Bug-Debian: https://bugs.debian.org/869888
-Forwarded: https://bugs.orfeo-toolbox.org/view.php?id=1443
-
---- a/Modules/ThirdParty/SiftFast/src/CMakeLists.txt
-+++ b/Modules/ThirdParty/SiftFast/src/CMakeLists.txt
-@@ -51,7 +51,6 @@ if( CMAKE_COMPILER_IS_GNUCC OR CMAKE_COM
-             message(FATAL_ERROR "Impossible to compile libsiftfast. Contact OTB development team")
-         endif()
-         set(OTB_DISABLE_FAST_FUNCTIONS_VALUE 1)
--    else()
-         message(STATUS "Try to compile libsiftfast.cpp done.")
-     endif()
- 
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 6dd775d..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-0001-BUG-Mantis-1419-FindOpenCV.cmake-supports-multiarch-.patch
-cmake-3.9.0.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/otb.git