[caffe] 10/10: remove unapplied patches
Zhou Mo
cdluminate-guest at moszumanska.debian.org
Tue May 17 15:37:22 UTC 2016
This is an automated email from the git hooks/post-receive script.
cdluminate-guest pushed a commit to branch master
in repository caffe.
commit 1811740ffa1c512d4e9079bb16b9a393c0d0b900
Author: Zhou Mo <cdluminate at gmail.com>
Date: Tue May 17 15:34:54 2016 +0000
remove unapplied patches
---
.../unapplied/avoid-cmake-configgen-error.patch | 11 -
.../unapplied/bump-python-version-to-3.patch | 249 ---------------------
.../workaround-switch-to-boost_python-py34.patch | 11 -
3 files changed, 271 deletions(-)
diff --git a/debian/patches/unapplied/avoid-cmake-configgen-error.patch b/debian/patches/unapplied/avoid-cmake-configgen-error.patch
deleted file mode 100644
index 0a3bc96..0000000
--- a/debian/patches/unapplied/avoid-cmake-configgen-error.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/cmake/ConfigGen.cmake
-+++ b/cmake/ConfigGen.cmake
-@@ -92,7 +92,7 @@
- # remove source and build dir includes
- caffe_get_items_with_prefix(${PROJECT_SOURCE_DIR} Caffe_INCLUDE_DIRS __insource)
- caffe_get_items_with_prefix(${PROJECT_BINARY_DIR} Caffe_INCLUDE_DIRS __inbinary)
-- list(REMOVE_ITEM Caffe_INCLUDE_DIRS ${__insource} ${__inbinary})
-+ list(REMOVE_ITEM Caffe_INCLUDE_DIRS ${__insource} ${__inbinary} "")
-
- # add `install` include folder
- set(lines
diff --git a/debian/patches/unapplied/bump-python-version-to-3.patch b/debian/patches/unapplied/bump-python-version-to-3.patch
deleted file mode 100644
index 148936c..0000000
--- a/debian/patches/unapplied/bump-python-version-to-3.patch
+++ /dev/null
@@ -1,249 +0,0 @@
-diff --git a/debian/control b/debian/control
-index ef0a37e..1402ff4 100644
---- a/debian/control
-+++ b/debian/control
-@@ -16,9 +16,9 @@ Build-Depends: cmake, debhelper (>=9),
- libgoogle-glog-dev,
- liblmdb-dev,
- protobuf-compiler,
-- python-all-dev,
-- python-all,
-- python-numpy,
-+ python3-all,
-+ python3-all-dev,
-+ python3-numpy,
- dh-python,
- bc,
- # constrain CUDA from experimental (31 Aug, 2015).
-@@ -27,7 +27,7 @@ Build-Depends: cmake, debhelper (>=9),
- Standards-Version: 3.9.6
- Homepage: http://caffe.berkeleyvision.org
- Vcs-Git: https://github.com/BVLC/caffe.git
--X-Python-Version: >= 2.6
-+X-Python-Version: >= 3.3
-
- Package: caffe-cpu
- Architecture: any
-@@ -116,26 +116,26 @@ Description: Fast open framework for Deep Learning (LibDev, CUDA)
- .
- This package contains the development files of CUDA caffe.
-
--Package: python-caffe-cpu
-+Package: python3-caffe-cpu
- Section: contrib/python
- Architecture: any
--Depends: ${misc:Depends}, ${python:Depends}, ${shlibs:Depends}, libcaffe-cpu0
--Conflicts: python-caffe-cuda
--Description: Fast open framework for Deep Learning (Python2, CPU_ONLY)
-+Depends: ${misc:Depends}, ${python3:Depends}, ${shlibs:Depends}, libcaffe-cpu0
-+Conflicts: python3-caffe-cuda
-+Description: Fast open framework for Deep Learning (Python3, CPU_ONLY)
- Caffe is a deep learning framework made with expression, speed,
- and modularity in mind. It is developed by the Berkeley Vision
- and Learning Center (BVLC) and community contributors.
- .
-- This package contains the python2 interface of CPU caffe.
-+ This package contains the python3 interface of CPU caffe.
-
--Package: python-caffe-cuda
-+Package: python3-caffe-cuda
- Section: contrib/python
- Architecture: i386 amd64
--Depends: ${misc:Depends}, ${python:Depends}, ${shlibs:Depends}, libcaffe-cuda0
--Conflicts: python-caffe-cpu
--Description: Fast open framework for Deep Learning (Python2, CUDA)
-+Depends: ${misc:Depends}, ${python3:Depends}, ${shlibs:Depends}, libcaffe-cuda0
-+Conflicts: python3-caffe-cpu
-+Description: Fast open framework for Deep Learning (Python3, CUDA)
- Caffe is a deep learning framework made with expression, speed,
- and modularity in mind. It is developed by the Berkeley Vision
- and Learning Center (BVLC) and community contributors.
- .
-- This package contains the python2 interface of CUDA caffe.
-+ This package contains the python3 interface of CUDA caffe.
-diff --git a/debian/python-caffe-cpu.install b/debian/python-caffe-cpu.install
-deleted file mode 100644
-index 9910106..0000000
---- a/debian/python-caffe-cpu.install
-+++ /dev/null
-@@ -1,19 +0,0 @@
--debian/tmp/caffe_cpu/python/requirements.txt usr/lib/python2.7/dist-packages/
--debian/tmp/caffe_cpu/python/classify.py usr/lib/python2.7/dist-packages/
--debian/tmp/caffe_cpu/python/caffe/pycaffe.py usr/lib/python2.7/dist-packages/caffe/
--debian/tmp/caffe_cpu/python/caffe/net_spec.py usr/lib/python2.7/dist-packages/caffe/
--debian/tmp/caffe_cpu/python/caffe/io.py usr/lib/python2.7/dist-packages/caffe/
--debian/tmp/caffe_cpu/python/caffe/imagenet/ilsvrc_2012_mean.npy usr/lib/python2.7/dist-packages/caffe/imagenet/
--debian/tmp/caffe_cpu/python/caffe/__init__.py usr/lib/python2.7/dist-packages/caffe/
--debian/tmp/caffe_cpu/python/caffe/classifier.py usr/lib/python2.7/dist-packages/caffe/
--debian/tmp/caffe_cpu/python/caffe/_caffe.so.0 usr/lib/python2.7/dist-packages/caffe/
--debian/tmp/caffe_cpu/python/caffe/test/test_net.py usr/lib/python2.7/dist-packages/caffe/test/
--debian/tmp/caffe_cpu/python/caffe/test/test_python_layer.py usr/lib/python2.7/dist-packages/caffe/test/
--debian/tmp/caffe_cpu/python/caffe/test/test_net_spec.py usr/lib/python2.7/dist-packages/caffe/test/
--debian/tmp/caffe_cpu/python/caffe/test/test_solver.py usr/lib/python2.7/dist-packages/caffe/test/
--debian/tmp/caffe_cpu/python/caffe/detector.py usr/lib/python2.7/dist-packages/caffe/
--debian/tmp/caffe_cpu/python/caffe/proto/caffe_pb2.py usr/lib/python2.7/dist-packages/caffe/proto/
--debian/tmp/caffe_cpu/python/caffe/proto/__init__.py usr/lib/python2.7/dist-packages/caffe/proto/
--debian/tmp/caffe_cpu/python/caffe/draw.py usr/lib/python2.7/dist-packages/caffe/
--debian/tmp/caffe_cpu/python/draw_net.py usr/lib/python2.7/dist-packages/
--debian/tmp/caffe_cpu/python/detect.py usr/lib/python2.7/dist-packages/
-diff --git a/debian/python-caffe-cpu.links b/debian/python-caffe-cpu.links
-deleted file mode 100644
-index 44df179..0000000
---- a/debian/python-caffe-cpu.links
-+++ /dev/null
-@@ -1 +0,0 @@
--usr/lib/python2.7/dist-packages/caffe/_caffe.so.0 usr/lib/python2.7/dist-packages/caffe/_caffe.so
-diff --git a/debian/python-caffe-cuda.install b/debian/python-caffe-cuda.install
-deleted file mode 100644
-index 0cbd147..0000000
---- a/debian/python-caffe-cuda.install
-+++ /dev/null
-@@ -1,19 +0,0 @@
--debian/tmp/caffe_cuda/python/requirements.txt usr/lib/python2.7/dist-packages/
--debian/tmp/caffe_cuda/python/classify.py usr/lib/python2.7/dist-packages/
--debian/tmp/caffe_cuda/python/caffe/pycaffe.py usr/lib/python2.7/dist-packages/caffe/
--debian/tmp/caffe_cuda/python/caffe/net_spec.py usr/lib/python2.7/dist-packages/caffe/
--debian/tmp/caffe_cuda/python/caffe/io.py usr/lib/python2.7/dist-packages/caffe/
--debian/tmp/caffe_cuda/python/caffe/imagenet/ilsvrc_2012_mean.npy usr/lib/python2.7/dist-packages/caffe/imagenet/
--debian/tmp/caffe_cuda/python/caffe/__init__.py usr/lib/python2.7/dist-packages/caffe/
--debian/tmp/caffe_cuda/python/caffe/classifier.py usr/lib/python2.7/dist-packages/caffe/
--debian/tmp/caffe_cuda/python/caffe/_caffe.so.0 usr/lib/python2.7/dist-packages/caffe/
--debian/tmp/caffe_cuda/python/caffe/test/test_net.py usr/lib/python2.7/dist-packages/caffe/test/
--debian/tmp/caffe_cuda/python/caffe/test/test_python_layer.py usr/lib/python2.7/dist-packages/caffe/test/
--debian/tmp/caffe_cuda/python/caffe/test/test_net_spec.py usr/lib/python2.7/dist-packages/caffe/test/
--debian/tmp/caffe_cuda/python/caffe/test/test_solver.py usr/lib/python2.7/dist-packages/caffe/test/
--debian/tmp/caffe_cuda/python/caffe/detector.py usr/lib/python2.7/dist-packages/caffe/
--debian/tmp/caffe_cuda/python/caffe/proto/caffe_pb2.py usr/lib/python2.7/dist-packages/caffe/proto/
--debian/tmp/caffe_cuda/python/caffe/proto/__init__.py usr/lib/python2.7/dist-packages/caffe/proto/
--debian/tmp/caffe_cuda/python/caffe/draw.py usr/lib/python2.7/dist-packages/caffe/
--debian/tmp/caffe_cuda/python/draw_net.py usr/lib/python2.7/dist-packages/
--debian/tmp/caffe_cuda/python/detect.py usr/lib/python2.7/dist-packages/
-diff --git a/debian/python-caffe-cuda.links b/debian/python-caffe-cuda.links
-deleted file mode 100644
-index 44df179..0000000
---- a/debian/python-caffe-cuda.links
-+++ /dev/null
-@@ -1 +0,0 @@
--usr/lib/python2.7/dist-packages/caffe/_caffe.so.0 usr/lib/python2.7/dist-packages/caffe/_caffe.so
-diff --git a/debian/python3-caffe-cpu.install b/debian/python3-caffe-cpu.install
-new file mode 100644
-index 0000000..240d425
---- /dev/null
-+++ b/debian/python3-caffe-cpu.install
-@@ -0,0 +1,19 @@
-+debian/tmp/caffe_cpu/python/requirements.txt usr/lib/python3/dist-packages/
-+debian/tmp/caffe_cpu/python/classify.py usr/lib/python3/dist-packages/
-+debian/tmp/caffe_cpu/python/caffe/pycaffe.py usr/lib/python3/dist-packages/caffe/
-+debian/tmp/caffe_cpu/python/caffe/net_spec.py usr/lib/python3/dist-packages/caffe/
-+debian/tmp/caffe_cpu/python/caffe/io.py usr/lib/python3/dist-packages/caffe/
-+debian/tmp/caffe_cpu/python/caffe/imagenet/ilsvrc_2012_mean.npy usr/lib/python3/dist-packages/caffe/imagenet/
-+debian/tmp/caffe_cpu/python/caffe/__init__.py usr/lib/python3/dist-packages/caffe/
-+debian/tmp/caffe_cpu/python/caffe/classifier.py usr/lib/python3/dist-packages/caffe/
-+debian/tmp/caffe_cpu/python/caffe/_caffe.so.0 usr/lib/python3/dist-packages/caffe/
-+debian/tmp/caffe_cpu/python/caffe/test/test_net.py usr/lib/python3/dist-packages/caffe/test/
-+debian/tmp/caffe_cpu/python/caffe/test/test_python_layer.py usr/lib/python3/dist-packages/caffe/test/
-+debian/tmp/caffe_cpu/python/caffe/test/test_net_spec.py usr/lib/python3/dist-packages/caffe/test/
-+debian/tmp/caffe_cpu/python/caffe/test/test_solver.py usr/lib/python3/dist-packages/caffe/test/
-+debian/tmp/caffe_cpu/python/caffe/detector.py usr/lib/python3/dist-packages/caffe/
-+debian/tmp/caffe_cpu/python/caffe/proto/caffe_pb2.py usr/lib/python3/dist-packages/caffe/proto/
-+debian/tmp/caffe_cpu/python/caffe/proto/__init__.py usr/lib/python3/dist-packages/caffe/proto/
-+debian/tmp/caffe_cpu/python/caffe/draw.py usr/lib/python3/dist-packages/caffe/
-+debian/tmp/caffe_cpu/python/draw_net.py usr/lib/python3/dist-packages/
-+debian/tmp/caffe_cpu/python/detect.py usr/lib/python3/dist-packages/
-diff --git a/debian/python3-caffe-cpu.links b/debian/python3-caffe-cpu.links
-new file mode 100644
-index 0000000..5b070d8
---- /dev/null
-+++ b/debian/python3-caffe-cpu.links
-@@ -0,0 +1 @@
-+usr/lib/python3/dist-packages/caffe/_caffe.so.0 usr/lib/python3/dist-packages/caffe/_caffe.so
-diff --git a/debian/python3-caffe-cuda.install b/debian/python3-caffe-cuda.install
-new file mode 100644
-index 0000000..21dda65
---- /dev/null
-+++ b/debian/python3-caffe-cuda.install
-@@ -0,0 +1,19 @@
-+debian/tmp/caffe_cuda/python/requirements.txt usr/lib/python3/dist-packages/
-+debian/tmp/caffe_cuda/python/classify.py usr/lib/python3/dist-packages/
-+debian/tmp/caffe_cuda/python/caffe/pycaffe.py usr/lib/python3/dist-packages/caffe/
-+debian/tmp/caffe_cuda/python/caffe/net_spec.py usr/lib/python3/dist-packages/caffe/
-+debian/tmp/caffe_cuda/python/caffe/io.py usr/lib/python3/dist-packages/caffe/
-+debian/tmp/caffe_cuda/python/caffe/imagenet/ilsvrc_2012_mean.npy usr/lib/python3/dist-packages/caffe/imagenet/
-+debian/tmp/caffe_cuda/python/caffe/__init__.py usr/lib/python3/dist-packages/caffe/
-+debian/tmp/caffe_cuda/python/caffe/classifier.py usr/lib/python3/dist-packages/caffe/
-+debian/tmp/caffe_cuda/python/caffe/_caffe.so.0 usr/lib/python3/dist-packages/caffe/
-+debian/tmp/caffe_cuda/python/caffe/test/test_net.py usr/lib/python3/dist-packages/caffe/test/
-+debian/tmp/caffe_cuda/python/caffe/test/test_python_layer.py usr/lib/python3/dist-packages/caffe/test/
-+debian/tmp/caffe_cuda/python/caffe/test/test_net_spec.py usr/lib/python3/dist-packages/caffe/test/
-+debian/tmp/caffe_cuda/python/caffe/test/test_solver.py usr/lib/python3/dist-packages/caffe/test/
-+debian/tmp/caffe_cuda/python/caffe/detector.py usr/lib/python3/dist-packages/caffe/
-+debian/tmp/caffe_cuda/python/caffe/proto/caffe_pb2.py usr/lib/python3/dist-packages/caffe/proto/
-+debian/tmp/caffe_cuda/python/caffe/proto/__init__.py usr/lib/python3/dist-packages/caffe/proto/
-+debian/tmp/caffe_cuda/python/caffe/draw.py usr/lib/python3/dist-packages/caffe/
-+debian/tmp/caffe_cuda/python/draw_net.py usr/lib/python3/dist-packages/
-+debian/tmp/caffe_cuda/python/detect.py usr/lib/python3/dist-packages/
-diff --git a/debian/python3-caffe-cuda.links b/debian/python3-caffe-cuda.links
-new file mode 100644
-index 0000000..5b070d8
---- /dev/null
-+++ b/debian/python3-caffe-cuda.links
-@@ -0,0 +1 @@
-+usr/lib/python3/dist-packages/caffe/_caffe.so.0 usr/lib/python3/dist-packages/caffe/_caffe.so
-diff --git a/debian/rules b/debian/rules
-index 5c247a4..893cfd8 100755
---- a/debian/rules
-+++ b/debian/rules
-@@ -25,7 +25,7 @@ CONFFLAG_CPU = \
- -DUSE_CUDNN=OFF \
- -DBUILD_SHARED_LIBS=ON \
- -DBUILD_python=ON \
-- -Dpython_version="2" \
-+ -Dpython_version="3" \
- -DBUILD_matlab=OFF \
- -DBUILD_docs=OFF \
- -DBUILD_python_layer=ON \
-@@ -39,7 +39,7 @@ CONFFLAG_CUDA = \
- -DUSE_CUDNN=OFF \
- -DBUILD_SHARED_LIBS=ON \
- -DBUILD_python=ON \
-- -Dpython_version="2" \
-+ -Dpython_version="3" \
- -DBUILD_matlab=OFF \
- -DBUILD_docs=OFF \
- -DBUILD_python_layer=ON \
-@@ -54,7 +54,7 @@ CONFFLAG_CUDA = \
- dh $@ \
- --parallel \
- --buildsystem=cmake \
-- --with python2
-+ --with python3
-
- override_dh_auto_configure:
- dh_auto_configure \
-@@ -94,7 +94,7 @@ ifeq (y, $(flag_build_caffe_cuda))
- endif
-
- override_dh_pysupport:
-- dh_python2
-+ dh_python3
-
- override_dh_auto_install:
- dh_auto_install --builddirectory=${CAFFE_CPU_BUILDDIR} \
-@@ -118,7 +118,7 @@ CONFFLAG_CPU_CUSTOM = \
- -DUSE_CUDNN=OFF \
- -DBUILD_SHARED_LIBS=ON \
- -DBUILD_python=ON \
-- -Dpython_version="2" \
-+ -Dpython_version="3" \
- -DBUILD_matlab=OFF \
- -DBUILD_docs=OFF \
- -DBUILD_python_layer=ON \
-@@ -132,7 +132,7 @@ CONFFLAG_CUDA_CUSTOM = \
- -DUSE_CUDNN=OFF \
- -DBUILD_SHARED_LIBS=ON \
- -DBUILD_python=ON \
-- -Dpython_version="2" \
-+ -Dpython_version="3" \
- -DBUILD_matlab=OFF \
- -DBUILD_docs=OFF \
- -DBUILD_python_layer=ON \
diff --git a/debian/patches/unapplied/workaround-switch-to-boost_python-py34.patch b/debian/patches/unapplied/workaround-switch-to-boost_python-py34.patch
deleted file mode 100644
index 5ec5b10..0000000
--- a/debian/patches/unapplied/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()
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/caffe.git
More information about the debian-science-commits
mailing list