[caffe] 183/249: dquilt: strip junk patches, add bump-python3-back-to-python2.patch in patches/unapplied
Zhou Mo
cdluminate-guest at moszumanska.debian.org
Tue Mar 8 14:51:39 UTC 2016
This is an automated email from the git hooks/post-receive script.
cdluminate-guest pushed a commit to branch debian/experimental
in repository caffe.
commit 7ef564c230edb30e09a491786d51331418f345ce
Author: Zhou Mo <cdluminate at gmail.com>
Date: Wed Sep 2 07:11:18 2015 +0000
dquilt: strip junk patches, add bump-python3-back-to-python2.patch in patches/unapplied
---
debian/patches/06-cmake-add-soname.patch | 11 -
debian/patches/series | 4 -
.../03-set-cmake-deps-openblas.patch | 0
.../04-fix-rpath-issue-in-cmake.patch | 0
.../{ => unapplied}/05-set-cmake-cpuonly.patch | 0
.../unapplied/bump-python3-back-to-python2.patch | 272 +++++++++++++++++++++
6 files changed, 272 insertions(+), 15 deletions(-)
diff --git a/debian/patches/06-cmake-add-soname.patch b/debian/patches/06-cmake-add-soname.patch
deleted file mode 100644
index 00db44e..0000000
--- a/debian/patches/06-cmake-add-soname.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/cmake/Targets.cmake
-+++ b/cmake/Targets.cmake
-@@ -7,7 +7,7 @@
- if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
- set(Caffe_LINK -Wl,-force_load caffe)
- elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
-- set(Caffe_LINK -Wl,--whole-archive caffe -Wl,--no-whole-archive)
-+ set(Caffe_LINK -Wl,--whole-archive caffe -Wl,--no-whole-archive -Wl,-soname,libcaffe.so.0)
- endif()
- endif()
-
diff --git a/debian/patches/series b/debian/patches/series
index 7294138..9898b93 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,7 +3,3 @@ fix-cmake-add-target-property-version-soversion.patch
00-fix-include-path-for-debian.patch
01-fix-makefile-rpath-and-soname.patch
02-empty-the-gitignore
-#03-set-cmake-deps-openblas.patch
-#04-fix-rpath-issue-in-cmake.patch
-#05-set-cmake-cpuonly.patch # cmake is used to build the caffe-cuda
-#06-cmake-add-soname.patch
diff --git a/debian/patches/03-set-cmake-deps-openblas.patch b/debian/patches/unapplied/03-set-cmake-deps-openblas.patch
similarity index 100%
rename from debian/patches/03-set-cmake-deps-openblas.patch
rename to debian/patches/unapplied/03-set-cmake-deps-openblas.patch
diff --git a/debian/patches/04-fix-rpath-issue-in-cmake.patch b/debian/patches/unapplied/04-fix-rpath-issue-in-cmake.patch
similarity index 100%
rename from debian/patches/04-fix-rpath-issue-in-cmake.patch
rename to debian/patches/unapplied/04-fix-rpath-issue-in-cmake.patch
diff --git a/debian/patches/05-set-cmake-cpuonly.patch b/debian/patches/unapplied/05-set-cmake-cpuonly.patch
similarity index 100%
rename from debian/patches/05-set-cmake-cpuonly.patch
rename to debian/patches/unapplied/05-set-cmake-cpuonly.patch
diff --git a/debian/patches/unapplied/bump-python3-back-to-python2.patch b/debian/patches/unapplied/bump-python3-back-to-python2.patch
new file mode 100644
index 0000000..1a2462c
--- /dev/null
+++ b/debian/patches/unapplied/bump-python3-back-to-python2.patch
@@ -0,0 +1,272 @@
+diff --git a/debian/control b/debian/control
+index 97c04d3..39da832 100644
+--- a/debian/control
++++ b/debian/control
+@@ -16,9 +16,8 @@ Build-Depends: cmake, debhelper (>=9),
+ libgoogle-glog-dev,
+ liblmdb-dev,
+ protobuf-compiler,
+- python3-all,
+- python3-all-dev,
+- python3-numpy,
++ python-all,
++ python-numpy,
+ dh-python,
+ bc,
+ # constrain CUDA from experimental (31 Aug, 2015).
+@@ -27,7 +26,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: >= 3.3
++X-Python-Version: >= 2.6
+
+ Package: caffe-cpu
+ Architecture: any
+@@ -116,26 +115,26 @@ Description: Fast open framework for Deep Learning (Library Dev, CUDA)
+ .
+ This package contains the development files of CUDA caffe.
+
+-Package: python3-caffe-cpu
++Package: python-caffe-cpu
+ Section: contrib/python
+ Architecture: any
+ Depends: ${misc:Depends}, ${python:Depends}, ${shlibs:Depends}, libcaffe-cpu0
+-Conflicts: python3-caffe-cuda
+-Description: Fast open framework for Deep Learning (Python3 Interface, CPU_ONLY)
++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,
+ and modularity in mind. It is developed by the Berkeley Vision
+ and Learning Center (BVLC) and community contributors.
+ .
+- This package contains the python3 interface of CPU caffe.
++ This package contains the python2 interface of CPU caffe.
+
+-Package: python3-caffe-cuda
++Package: python-caffe-cuda
+ Section: contrib/python
+ Architecture: i386 amd64
+ Depends: ${misc:Depends}, ${python:Depends}, ${shlibs:Depends}, libcaffe-cuda0
+-Conflicts: python3-caffe-cpu
+-Description: Fast open framework for Deep Learning (Python3 Interface, CUDA)
++Conflicts: python-caffe-cpu
++Description: Fast open framework for Deep Learning (Python Interface, 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 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
+--- /dev/null
++++ b/debian/python-caffe-cpu.install
+@@ -0,0 +1,19 @@
++debian/tmp/caffe_cpu/python/requirements.txt usr/lib/python2.7/dist-packages/caffe/
++debian/tmp/caffe_cpu/python/classify.py usr/lib/python2.7/dist-packages/caffe/
++debian/tmp/caffe_cpu/python/caffe/pycaffe.py usr/lib/python2.7/dist-packages/caffe/caffe/
++debian/tmp/caffe_cpu/python/caffe/net_spec.py usr/lib/python2.7/dist-packages/caffe/caffe/
++debian/tmp/caffe_cpu/python/caffe/io.py usr/lib/python2.7/dist-packages/caffe/caffe/
++debian/tmp/caffe_cpu/python/caffe/imagenet/ilsvrc_2012_mean.npy usr/lib/python2.7/dist-packages/caffe/caffe/imagenet/
++debian/tmp/caffe_cpu/python/caffe/__init__.py usr/lib/python2.7/dist-packages/caffe/caffe/
++debian/tmp/caffe_cpu/python/caffe/classifier.py usr/lib/python2.7/dist-packages/caffe/caffe/
++debian/tmp/caffe_cpu/python/caffe/_caffe.so.0 usr/lib/python2.7/dist-packages/caffe/caffe/
++debian/tmp/caffe_cpu/python/caffe/test/test_net.py usr/lib/python2.7/dist-packages/caffe/caffe/test/
++debian/tmp/caffe_cpu/python/caffe/test/test_python_layer.py usr/lib/python2.7/dist-packages/caffe/caffe/test/
++debian/tmp/caffe_cpu/python/caffe/test/test_net_spec.py usr/lib/python2.7/dist-packages/caffe/caffe/test/
++debian/tmp/caffe_cpu/python/caffe/test/test_solver.py usr/lib/python2.7/dist-packages/caffe/caffe/test/
++debian/tmp/caffe_cpu/python/caffe/detector.py usr/lib/python2.7/dist-packages/caffe/caffe/
++debian/tmp/caffe_cpu/python/caffe/proto/caffe_pb2.py usr/lib/python2.7/dist-packages/caffe/caffe/proto/
++debian/tmp/caffe_cpu/python/caffe/proto/__init__.py usr/lib/python2.7/dist-packages/caffe/caffe/proto/
++debian/tmp/caffe_cpu/python/caffe/draw.py usr/lib/python2.7/dist-packages/caffe/caffe/
++debian/tmp/caffe_cpu/python/draw_net.py usr/lib/python2.7/dist-packages/caffe/
++debian/tmp/caffe_cpu/python/detect.py usr/lib/python2.7/dist-packages/caffe/
+diff --git a/debian/python-caffe-cpu.links b/debian/python-caffe-cpu.links
+new file mode 100644
+index 0000000..44df179
+--- /dev/null
++++ b/debian/python-caffe-cpu.links
+@@ -0,0 +1 @@
++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
+new file mode 100644
+index 0000000..0cc8bc5
+--- /dev/null
++++ b/debian/python-caffe-cuda.install
+@@ -0,0 +1,19 @@
++debian/tmp/caffe_cuda/python/requirements.txt usr/lib/python2.7/dist-packages/caffe/
++debian/tmp/caffe_cuda/python/classify.py usr/lib/python2.7/dist-packages/caffe/
++debian/tmp/caffe_cuda/python/caffe/pycaffe.py usr/lib/python2.7/dist-packages/caffe/caffe/
++debian/tmp/caffe_cuda/python/caffe/net_spec.py usr/lib/python2.7/dist-packages/caffe/caffe/
++debian/tmp/caffe_cuda/python/caffe/io.py usr/lib/python2.7/dist-packages/caffe/caffe/
++debian/tmp/caffe_cuda/python/caffe/imagenet/ilsvrc_2012_mean.npy usr/lib/python2.7/dist-packages/caffe/caffe/imagenet/
++debian/tmp/caffe_cuda/python/caffe/__init__.py usr/lib/python2.7/dist-packages/caffe/caffe/
++debian/tmp/caffe_cuda/python/caffe/classifier.py usr/lib/python2.7/dist-packages/caffe/caffe/
++debian/tmp/caffe_cuda/python/caffe/_caffe.so.0 usr/lib/python2.7/dist-packages/caffe/caffe/
++debian/tmp/caffe_cuda/python/caffe/test/test_net.py usr/lib/python2.7/dist-packages/caffe/caffe/test/
++debian/tmp/caffe_cuda/python/caffe/test/test_python_layer.py usr/lib/python2.7/dist-packages/caffe/caffe/test/
++debian/tmp/caffe_cuda/python/caffe/test/test_net_spec.py usr/lib/python2.7/dist-packages/caffe/caffe/test/
++debian/tmp/caffe_cuda/python/caffe/test/test_solver.py usr/lib/python2.7/dist-packages/caffe/caffe/test/
++debian/tmp/caffe_cuda/python/caffe/detector.py usr/lib/python2.7/dist-packages/caffe/caffe/
++debian/tmp/caffe_cuda/python/caffe/proto/caffe_pb2.py usr/lib/python2.7/dist-packages/caffe/caffe/proto/
++debian/tmp/caffe_cuda/python/caffe/proto/__init__.py usr/lib/python2.7/dist-packages/caffe/caffe/proto/
++debian/tmp/caffe_cuda/python/caffe/draw.py usr/lib/python2.7/dist-packages/caffe/caffe/
++debian/tmp/caffe_cuda/python/draw_net.py usr/lib/python2.7/dist-packages/caffe/
++debian/tmp/caffe_cuda/python/detect.py usr/lib/python2.7/dist-packages/caffe/
+diff --git a/debian/python-caffe-cuda.links b/debian/python-caffe-cuda.links
+new file mode 100644
+index 0000000..44df179
+--- /dev/null
++++ b/debian/python-caffe-cuda.links
+@@ -0,0 +1 @@
++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
+deleted file mode 100644
+index cd5c4ba..0000000
+--- a/debian/python3-caffe-cpu.install
++++ /dev/null
+@@ -1,19 +0,0 @@
+-debian/tmp/caffe_cpu/python/requirements.txt usr/lib/python3/dist-packages/caffe/
+-debian/tmp/caffe_cpu/python/classify.py usr/lib/python3/dist-packages/caffe/
+-debian/tmp/caffe_cpu/python/caffe/pycaffe.py usr/lib/python3/dist-packages/caffe/caffe/
+-debian/tmp/caffe_cpu/python/caffe/net_spec.py usr/lib/python3/dist-packages/caffe/caffe/
+-debian/tmp/caffe_cpu/python/caffe/io.py usr/lib/python3/dist-packages/caffe/caffe/
+-debian/tmp/caffe_cpu/python/caffe/imagenet/ilsvrc_2012_mean.npy usr/lib/python3/dist-packages/caffe/caffe/imagenet/
+-debian/tmp/caffe_cpu/python/caffe/__init__.py usr/lib/python3/dist-packages/caffe/caffe/
+-debian/tmp/caffe_cpu/python/caffe/classifier.py usr/lib/python3/dist-packages/caffe/caffe/
+-debian/tmp/caffe_cpu/python/caffe/_caffe.so.0 usr/lib/python3/dist-packages/caffe/caffe/
+-debian/tmp/caffe_cpu/python/caffe/test/test_net.py usr/lib/python3/dist-packages/caffe/caffe/test/
+-debian/tmp/caffe_cpu/python/caffe/test/test_python_layer.py usr/lib/python3/dist-packages/caffe/caffe/test/
+-debian/tmp/caffe_cpu/python/caffe/test/test_net_spec.py usr/lib/python3/dist-packages/caffe/caffe/test/
+-debian/tmp/caffe_cpu/python/caffe/test/test_solver.py usr/lib/python3/dist-packages/caffe/caffe/test/
+-debian/tmp/caffe_cpu/python/caffe/detector.py usr/lib/python3/dist-packages/caffe/caffe/
+-debian/tmp/caffe_cpu/python/caffe/proto/caffe_pb2.py usr/lib/python3/dist-packages/caffe/caffe/proto/
+-debian/tmp/caffe_cpu/python/caffe/proto/__init__.py usr/lib/python3/dist-packages/caffe/caffe/proto/
+-debian/tmp/caffe_cpu/python/caffe/draw.py usr/lib/python3/dist-packages/caffe/caffe/
+-debian/tmp/caffe_cpu/python/draw_net.py usr/lib/python3/dist-packages/caffe/
+-debian/tmp/caffe_cpu/python/detect.py usr/lib/python3/dist-packages/caffe/
+diff --git a/debian/python3-caffe-cpu.links b/debian/python3-caffe-cpu.links
+deleted file mode 100644
+index 5b070d8..0000000
+--- a/debian/python3-caffe-cpu.links
++++ /dev/null
+@@ -1 +0,0 @@
+-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
+deleted file mode 100644
+index 5964f6e..0000000
+--- a/debian/python3-caffe-cuda.install
++++ /dev/null
+@@ -1,19 +0,0 @@
+-debian/tmp/caffe_cuda/python/requirements.txt usr/lib/python3/dist-packages/caffe/
+-debian/tmp/caffe_cuda/python/classify.py usr/lib/python3/dist-packages/caffe/
+-debian/tmp/caffe_cuda/python/caffe/pycaffe.py usr/lib/python3/dist-packages/caffe/caffe/
+-debian/tmp/caffe_cuda/python/caffe/net_spec.py usr/lib/python3/dist-packages/caffe/caffe/
+-debian/tmp/caffe_cuda/python/caffe/io.py usr/lib/python3/dist-packages/caffe/caffe/
+-debian/tmp/caffe_cuda/python/caffe/imagenet/ilsvrc_2012_mean.npy usr/lib/python3/dist-packages/caffe/caffe/imagenet/
+-debian/tmp/caffe_cuda/python/caffe/__init__.py usr/lib/python3/dist-packages/caffe/caffe/
+-debian/tmp/caffe_cuda/python/caffe/classifier.py usr/lib/python3/dist-packages/caffe/caffe/
+-debian/tmp/caffe_cuda/python/caffe/_caffe.so.0 usr/lib/python3/dist-packages/caffe/caffe/
+-debian/tmp/caffe_cuda/python/caffe/test/test_net.py usr/lib/python3/dist-packages/caffe/caffe/test/
+-debian/tmp/caffe_cuda/python/caffe/test/test_python_layer.py usr/lib/python3/dist-packages/caffe/caffe/test/
+-debian/tmp/caffe_cuda/python/caffe/test/test_net_spec.py usr/lib/python3/dist-packages/caffe/caffe/test/
+-debian/tmp/caffe_cuda/python/caffe/test/test_solver.py usr/lib/python3/dist-packages/caffe/caffe/test/
+-debian/tmp/caffe_cuda/python/caffe/detector.py usr/lib/python3/dist-packages/caffe/caffe/
+-debian/tmp/caffe_cuda/python/caffe/proto/caffe_pb2.py usr/lib/python3/dist-packages/caffe/caffe/proto/
+-debian/tmp/caffe_cuda/python/caffe/proto/__init__.py usr/lib/python3/dist-packages/caffe/caffe/proto/
+-debian/tmp/caffe_cuda/python/caffe/draw.py usr/lib/python3/dist-packages/caffe/caffe/
+-debian/tmp/caffe_cuda/python/draw_net.py usr/lib/python3/dist-packages/caffe/
+-debian/tmp/caffe_cuda/python/detect.py usr/lib/python3/dist-packages/caffe/
+diff --git a/debian/python3-caffe-cuda.links b/debian/python3-caffe-cuda.links
+deleted file mode 100644
+index 5b070d8..0000000
+--- a/debian/python3-caffe-cuda.links
++++ /dev/null
+@@ -1 +0,0 @@
+-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 d107b71..9471d11 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="3" \
++ -Dpython_version="2" \
+ -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="3" \
++ -Dpython_version="2" \
+ -DBUILD_matlab=OFF \
+ -DBUILD_docs=OFF \
+ -DBUILD_python_layer=ON \
+@@ -54,7 +54,7 @@ CONFFLAG_CUDA = \
+ dh $@ \
+ --parallel \
+ --buildsystem=cmake \
+- --with python3
++ --with python2
+
+ override_dh_auto_configure:
+ dh_auto_configure \
+@@ -94,7 +94,7 @@ ifeq (y, $(flag_build_caffe_cuda))
+ endif
+
+ override_dh_pysupport:
+- dh_python3
++ dh_python2
+
+ 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="3" \
++ -Dpython_version="2" \
+ -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="3" \
++ -Dpython_version="2" \
+ -DBUILD_matlab=OFF \
+ -DBUILD_docs=OFF \
+ -DBUILD_python_layer=ON \
--
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