[opencv] 01/02: d/p/support_multiarch: forward the patch after a small edit

[Mattia Rizzolo]

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

mattia pushed a commit to branch sid
in repository opencv.

commit 601a539b78940ef580a83fbbb8d2ba250c2f7274
Author: Mattia Rizzolo <mattia at debian.org>
Date:   Tue Oct 17 02:14:46 2017 +0200

    d/p/support_multiarch: forward the patch after a small edit
    
    Signed-off-by: Mattia Rizzolo <mattia at debian.org>
---
 debian/patches/support_multiarch | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/debian/patches/support_multiarch b/debian/patches/support_multiarch
index 08af6bd..7a33926 100644
--- a/debian/patches/support_multiarch
+++ b/debian/patches/support_multiarch
@@ -1,19 +1,19 @@
 Description: Install the libraries in the multiarch path
+Forwarded: https://github.com/opencv/opencv/pull/9864
 
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index cc45f6f394..9c55e09538 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -395,7 +395,7 @@ else()
+@@ -395,7 +395,8 @@
      ocv_update(OPENCV_OTHER_INSTALL_PATH   etc)
      ocv_update(OPENCV_CONFIG_INSTALL_PATH  ".")
    else()
 -    ocv_update(OPENCV_LIB_INSTALL_PATH     lib${LIB_SUFFIX})
++    include(GNUInstallDirs)
 +    set(OPENCV_LIB_INSTALL_PATH     ${CMAKE_INSTALL_LIBDIR}${LIB_SUFFIX})
      ocv_update(OPENCV_3P_LIB_INSTALL_PATH  share/OpenCV/3rdparty/${OPENCV_LIB_INSTALL_PATH})
      ocv_update(OPENCV_SAMPLES_SRC_INSTALL_PATH    share/OpenCV/samples)
      ocv_update(OPENCV_JAR_INSTALL_PATH share/OpenCV/java)
-@@ -404,7 +404,7 @@ else()
+@@ -404,7 +405,7 @@
      if(NOT DEFINED OPENCV_CONFIG_INSTALL_PATH)
        math(EXPR SIZEOF_VOID_P_BITS "8 * ${CMAKE_SIZEOF_VOID_P}")
        if(LIB_SUFFIX AND NOT SIZEOF_VOID_P_BITS EQUAL LIB_SUFFIX)
@@ -22,11 +22,3 @@ index cc45f6f394..9c55e09538 100644
        else()
          ocv_update(OPENCV_CONFIG_INSTALL_PATH share/OpenCV)
        endif()
-@@ -515,6 +515,7 @@ if(UNIX)
-   find_package(PkgConfig QUIET)
-   include(CheckFunctionExists)
-   include(CheckIncludeFile)
-+  include(GNUInstallDirs)
- 
-   if(NOT APPLE)
-     CHECK_INCLUDE_FILE(pthread.h HAVE_LIBPTHREAD)

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