[caffe-contrib] 01/02: patch: import cmake-link-correct-python-lib.patch from src:caffe

[Zhou Mo]

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

cdluminate-guest pushed a commit to branch master
in repository caffe-contrib.

commit 5219405aff6df255a85b778e767df1c3f7625a42
Author: Zhou Mo <cdluminate at gmail.com>
Date:   Thu Jan 12 04:44:57 2017 +0000

    patch: import cmake-link-correct-python-lib.patch from src:caffe
---
 debian/changelog                                   |  7 +++++++
 debian/patches/cmake-link-correct-python-lib.patch | 16 ++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 24 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 5ffa57b..6e47708 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+caffe-contrib (1.0.0~rc3+20161127-g24d2f67-4) UNRELEASED; urgency=medium
+
+  * Add patch: cmake-link-correct-python-lib.patch from src:caffe to fix
+    the FTBFS (See #850989).
+
+ -- Zhou Mo <cdluminate at gmail.com>  Thu, 12 Jan 2017 04:43:35 +0000
+
 caffe-contrib (1.0.0~rc3+20161127-g24d2f67-3) unstable; urgency=medium
 
   * Avoid autopkgtest failure by fixing stderr redirection.
diff --git a/debian/patches/cmake-link-correct-python-lib.patch b/debian/patches/cmake-link-correct-python-lib.patch
new file mode 100644
index 0000000..b55a76d
--- /dev/null
+++ b/debian/patches/cmake-link-correct-python-lib.patch
@@ -0,0 +1,16 @@
+Description: fix BTBFS bug #850989
+Forward: keep it here.
+diff --git a/cmake/Dependencies.cmake b/cmake/Dependencies.cmake
+index ae9ce8e..87d0858 100644
+--- a/cmake/Dependencies.cmake
++++ b/cmake/Dependencies.cmake
+@@ -137,7 +137,8 @@ if(BUILD_python)
+       endif()
+     endwhile()
+     if(NOT Boost_PYTHON_FOUND)
+-      find_package(Boost 1.46 COMPONENTS python)
++      find_package(Boost 1.46 COMPONENTS python-py35)
++      set(Boost_PYTHON_FOUND ${Boost_PYTHON-PY35_FOUND})
+     endif()
+   else()
+     # disable Python 3 search
diff --git a/debian/patches/series b/debian/patches/series
index 9487535..5e94885 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ cmake-avoid-argument-missing
 fix-more-float-comparison-precision-issue
 fix-more-float-comparison-precision-issue2
 0001-Add-Pascal-to-all-cuda-architectures.patch
+cmake-link-correct-python-lib.patch

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