This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository otb.
commit 31579e1ec090e1890926b690209f0ddb8f02795f Author: Bas Couwenberg <[email protected]> Date: Wed Jun 21 18:59:06 2017 +0200 Replace opencv-i386.patch with upstream patch. (closes: #865414) --- debian/changelog | 8 ++++++++ ...G-Mantis-1419-FindOpenCV.cmake-supports-multiarch-.patch} | 12 +++++++----- debian/patches/series | 2 +- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index c873de1..f4556a9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +otb (6.0.0+dfsg-2) UNRELEASED; urgency=medium + + * Team upload. + * Replace opencv-i386.patch with upstream patch. + (closes: #865414) + + -- Bas Couwenberg <[email protected]> Wed, 21 Jun 2017 18:58:15 +0200 + otb (6.0.0+dfsg-1) unstable; urgency=medium * Team upload. diff --git a/debian/patches/opencv-i386.patch b/debian/patches/0001-BUG-Mantis-1419-FindOpenCV.cmake-supports-multiarch-.patch similarity index 54% rename from debian/patches/opencv-i386.patch rename to debian/patches/0001-BUG-Mantis-1419-FindOpenCV.cmake-supports-multiarch-.patch index 5306081..270ffba 100644 --- a/debian/patches/opencv-i386.patch +++ b/debian/patches/0001-BUG-Mantis-1419-FindOpenCV.cmake-supports-multiarch-.patch @@ -1,6 +1,8 @@ -Description: Fix detection of OpenCV on i386 architecture. -Author: Bas Couwenberg <[email protected]> -Forwarded: https://bugs.orfeo-toolbox.org/view.php?id=1419 +Description: Support Multi-Arch paths in FindOpenCV.cmake. +Author: Guillaume Pasero <[email protected]> +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 @@ -9,7 +11,7 @@ Forwarded: https://bugs.orfeo-toolbox.org/view.php?id=1419 NAMES ${opencv_core_NAMES} PATHS ${OPENCV_SEARCH_PATH} - PATH_SUFFIXES "lib" "lib64" "lib/x86_64-linux-gnu" -+ PATH_SUFFIXES "lib" "lib64" "lib/x86_64-linux-gnu" "lib/i386-linux-gnu" ++ PATH_SUFFIXES "lib" "lib64" "lib/${CMAKE_LIBRARY_ARCHITECTURE}" NO_DEFAULT_PATH DOC "Path to opencv_core library") @@ -18,7 +20,7 @@ Forwarded: https://bugs.orfeo-toolbox.org/view.php?id=1419 NAMES ${opencv_ml_NAMES} PATHS ${OPENCV_SEARCH_PATH} - PATH_SUFFIXES "lib" "lib64" "lib/x86_64-linux-gnu" -+ PATH_SUFFIXES "lib" "lib64" "lib/x86_64-linux-gnu" "lib/i386-linux-gnu" ++ PATH_SUFFIXES "lib" "lib64" "lib/${CMAKE_LIBRARY_ARCHITECTURE}" NO_DEFAULT_PATH DOC "Path to opencv_ml library") diff --git a/debian/patches/series b/debian/patches/series index 851399f..4f65ea9 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1 @@ -opencv-i386.patch +0001-BUG-Mantis-1419-FindOpenCV.cmake-supports-multiarch-.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/otb.git _______________________________________________ Pkg-grass-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
