[caffe] 10/11: rules: bump to python3

[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.

commit 6f7891264997e6d9a2436fc4ee6bbdb83d2aa0f8
Author: Zhou Mo <cdluminate at gmail.com>
Date:   Fri Jun 3 09:26:58 2016 +0000

    rules: bump to python3
---
 debian/rules | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/debian/rules b/debian/rules
index 564fa6b..259b35d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,19 +14,13 @@ ORIG_SOURCE   := "https://github.com/BVLC/caffe/archive/rc3.tar.gz"
 CAFFE_SOVER   := 1.0.0-rc3
 
 BUILDDIR      := "caffe_cpu_build"
-SUITE         := caffe-cpu libcaffe-cpu1 libcaffe-cpu-dev python-caffe-cpu
+SUITE         := caffe-cpu libcaffe-cpu1 libcaffe-cpu-dev python3-caffe-cpu
 SUITE_P       := $(foreach PKG, $(SUITE), --package=$(PKG))
 
 TEMPLATES     := $(wildcard debian/*.in)
 AUTOGEN       := $(patsubst %.in,%,$(TEMPLATES))
 
 ## CMake Configuration Template.
-## Include template and override the blank options in later configs.
-### NOTE
-## * CUDA version should require GCC-5 because of NVCC campatibility.
-## * we don't build ALL docs, so BUILD_docs is disabled. TODO: build docs.
-## * python3 dependency not satisfied yet, can't build python3-caffe*.
-### MAINTAINER
 ## * PLEASE sync this common template with caffe-contrib source.
 CMAKE_CONFIGURE_TEMPLATE = \
 	-DALLOW_LMDB_NOLOCK=OFF \
@@ -36,7 +30,7 @@ CMAKE_CONFIGURE_TEMPLATE = \
 	-DBUILD_matlab=OFF \
 	-DBUILD_python=ON \
 	-DBUILD_python_layer=ON \
-	-Dpython_version="2" \
+	-Dpython_version="3" \
 	-DCMAKE_BUILD_TYPE="Release" \
 	-DCMAKE_C_FLAGS="$(CFLAGS) $(CPPFLAGS)" \
 	-DCMAKE_CXX_FLAGS="$(CXXFLAGS) $(CPPFLAGS)" \
@@ -46,7 +40,6 @@ CMAKE_CONFIGURE_TEMPLATE = \
 	-DUSE_LEVELDB=ON \
 	-DUSE_LMDB=ON \
 	-DUSE_OPENCV=ON \
-	-DCMAKE_INSTALL_PREFIX=$(FILL_THIS_BLANK) \
 	-DCPU_ONLY=$(FILL_THIS_BLANK) \
 	-DCMAKE_INSTALL_PREFIX="/usr"
 #	-DCUDA_ARCH_NAME="All"
@@ -68,7 +61,7 @@ CONFFLAG_CPU = \
 	dh $@ \
 		--parallel \
 		--buildsystem=cmake \
-		--with python2,bash-completion
+		--with python3,bash-completion
 
 .PHONY: autogen
 autogen: $(AUTOGEN)
@@ -94,7 +87,6 @@ override_dh_auto_build-indep:
 	gzip -d examples/finetune_flickr_style/flickr_style.csv.gz # lintian gzip timestamp
 	gzip -n ./examples/finetune_flickr_style/flickr_style.csv # ditto
 
-
 override_dh_auto_build-arch:
 	dh_auto_build --builddirectory=$(BUILDDIR) \
 		-- all caffe pycaffe test.testbin
@@ -106,15 +98,15 @@ override_dh_auto_test-arch:
 		-- runtest LD_LIBRARY_PATH=$(BUILDDIR)/lib/ 
 override_dh_auto_test-indep:
 
-override_dh_python2:
-	dh_python2 --requires=python/requirements.txt
+override_dh_python3:
+	dh_python3 --requires=python/requirements.txt
 	dh_numpy
 
 override_dh_auto_install:
 	dh_auto_install --builddirectory=$(BUILDDIR) -- install
 
 override_dh_makeshlibs:
-	dh_makeshlibs --package=python-caffe-cpu -X/usr/lib/python
+	dh_makeshlibs --package=python3-caffe-cpu -X/usr/lib/python
 	dh_makeshlibs --remaining-packages
 
 get-orig-source:

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