[caffe-contrib] 186/362: patch: update python2 back bump patch

[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 78c768ae413446d331ca662a9a8254c5e308e573
Author: Zhou Mo <cdluminate at gmail.com>
Date:   Wed Sep 2 08:06:30 2015 +0000

    patch: update python2 back bump patch
---
 .../unapplied/bump-python3-back-to-python2.patch   | 34 ++++------------------
 1 file changed, 5 insertions(+), 29 deletions(-)

diff --git a/debian/patches/unapplied/bump-python3-back-to-python2.patch b/debian/patches/unapplied/bump-python3-back-to-python2.patch
index 1a2462c..a655b55 100644
--- a/debian/patches/unapplied/bump-python3-back-to-python2.patch
+++ b/debian/patches/unapplied/bump-python3-back-to-python2.patch
@@ -1,5 +1,5 @@
 diff --git a/debian/control b/debian/control
-index 97c04d3..39da832 100644
+index 1402ff4..39da832 100644
 --- a/debian/control
 +++ b/debian/control
 @@ -16,9 +16,8 @@ Build-Depends: cmake, debhelper (>=9),
@@ -31,9 +31,10 @@ index 97c04d3..39da832 100644
 +Package: python-caffe-cpu
  Section: contrib/python
  Architecture: any
- Depends: ${misc:Depends}, ${python:Depends}, ${shlibs:Depends}, libcaffe-cpu0
+-Depends: ${misc:Depends}, ${python3:Depends}, ${shlibs:Depends}, libcaffe-cpu0
 -Conflicts: python3-caffe-cuda
 -Description: Fast open framework for Deep Learning (Python3 Interface, CPU_ONLY)
++Depends: ${misc:Depends}, ${python:Depends}, ${shlibs:Depends}, libcaffe-cpu0
 +Conflicts: python-caffe-cuda
 +Description: Fast open framework for Deep Learning (Python Interface, CPU_ONLY)
   Caffe is a deep learning framework made with expression, speed, 
@@ -47,9 +48,10 @@ index 97c04d3..39da832 100644
 +Package: python-caffe-cuda
  Section: contrib/python
  Architecture: i386 amd64
- Depends: ${misc:Depends}, ${python:Depends}, ${shlibs:Depends}, libcaffe-cuda0
+-Depends: ${misc:Depends}, ${python3:Depends}, ${shlibs:Depends}, libcaffe-cuda0
 -Conflicts: python3-caffe-cpu
 -Description: Fast open framework for Deep Learning (Python3 Interface, CUDA)
++Depends: ${misc:Depends}, ${python:Depends}, ${shlibs:Depends}, libcaffe-cuda0
 +Conflicts: python-caffe-cpu
 +Description: Fast open framework for Deep Learning (Python Interface, CUDA)
   Caffe is a deep learning framework made with expression, speed, 
@@ -58,32 +60,6 @@ index 97c04d3..39da832 100644
   .
 - This package contains the python3 interface of CUDA caffe.
 + This package contains the python2 interface of CUDA caffe.
-diff --git a/debian/patches/series b/debian/patches/series
-index 7294138..851b862 100644
---- a/debian/patches/series
-+++ b/debian/patches/series
-@@ -1,4 +1,3 @@
--workaround-switch-to-boost_python-py34.patch
- fix-cmake-add-target-property-version-soversion.patch
- 00-fix-include-path-for-debian.patch
- 01-fix-makefile-rpath-and-soname.patch
-diff --git a/debian/patches/workaround-switch-to-boost_python-py34.patch b/debian/patches/workaround-switch-to-boost_python-py34.patch
-deleted file mode 100644
-index 5ec5b10..0000000
---- a/debian/patches/workaround-switch-to-boost_python-py34.patch
-+++ /dev/null
-@@ -1,11 +0,0 @@
----- a/cmake/Dependencies.cmake
--+++ b/cmake/Dependencies.cmake
--@@ -131,7 +131,7 @@
--     if(BUILD_python_layer)
--       add_definitions(-DWITH_PYTHON_LAYER)
--       include_directories(SYSTEM ${PYTHON_INCLUDE_DIRS} ${NUMPY_INCLUDE_DIR} ${Boost_INCLUDE_DIRS})
---      list(APPEND Caffe_LINKER_LIBS ${PYTHON_LIBRARIES} ${Boost_LIBRARIES})
--+      list(APPEND Caffe_LINKER_LIBS ${PYTHON_LIBRARIES} "boost_python-py34")
--     endif()
--   endif()
-- endif()
 diff --git a/debian/python-caffe-cpu.install b/debian/python-caffe-cpu.install
 new file mode 100644
 index 0000000..9bbfbfb

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