[caffe-contrib] 339/362: rules: update

[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 b0fc42df3a6888c379400615d7fea7a6355a880c
Author: Zhou Mo <cdluminate at gmail.com>
Date:   Wed Mar 30 06:18:02 2016 +0000

    rules: update
---
 debian/rules | 33 ++++++++++++++++-----------------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/debian/rules b/debian/rules
index c606abd..c83895a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -45,10 +45,13 @@ CMAKE_CONFIGURE_TEMPLATE = \
 	-DCMAKE_INSTALL_PREFIX=$(FILL_THIS_BLANK) \
 	-DCPU_ONLY=$(FILL_THIS_BLANK) \
 	-DCUDA_ARCH_NAME="All"
-CONFFLAG_CPU = $(CMAKE_CONFIGURE_TEMPLATE) \
+
+CONFFLAG_CPU = \
+	$(CMAKE_CONFIGURE_TEMPLATE) \
 	-DCMAKE_INSTALL_PREFIX="/caffe_cpu" \
 	-DCPU_ONLY=ON
-CONFFLAG_CUDA = $(CMAKE_CONFIGURE_TEMPLATE) \
+CONFFLAG_CUDA = \
+	$(CMAKE_CONFIGURE_TEMPLATE) \
 	-DCMAKE_INSTALL_PREFIX="/caffe_cuda" \
 	-DCPU_ONLY=OFF
 
@@ -56,19 +59,18 @@ CONFFLAG_CUDA = $(CMAKE_CONFIGURE_TEMPLATE) \
 	dh $@ \
 		--parallel \
 		--buildsystem=cmake \
-		--with python2 --requires=python/requirements.txt
+		--with python2 --requires=python/requirs.txt
 
 autogen:
+	ln -s python/requirments.txt python/requires.txt
 	python3 debian/template_autogen.py $(CAFFE_SOVER)
 
 override_dh_auto_configure: autogen
 	dh_auto_configure \
-		--builddirectory=$(CAFFE_CPU_BUILDDIR) \
-		-- $(CONFFLAG_CPU)
+		--builddirectory=$(CAFFE_CPU_BUILDDIR) -- $(CONFFLAG_CPU)
 ifeq (y, $(flag_build_caffe_cuda))
 	dh_auto_configure \
-		--builddirectory=$(CAFFE_CUDA_BUILDDIR) \
-		-- $(CONFFLAG_CUDA)
+		--builddirectory=$(CAFFE_CUDA_BUILDDIR) -- $(CONFFLAG_CUDA)
 endif	
 
 override_dh_auto_clean:
@@ -77,6 +79,7 @@ override_dh_auto_clean:
 	#-$(RM) -rf $(CAFFE_CPU_BUILDDIR) $(CAFFE_CUDA_BUILDDIR)
 	-$(RM) -rf python/caffe/proto/
 	-$(RM) python/caffe/_caffe.so
+	-$(RM) python/requires.txt
 
 override_dh_auto_build:
 	dh_auto_build --builddirectory=$(CAFFE_CPU_BUILDDIR) \
@@ -92,8 +95,8 @@ override_dh_auto_test:
 	dh_auto_test --builddirectory=$(CAFFE_CPU_BUILDDIR) \
 		-- runtest LD_LIBRARY_PATH=$(CAFFE_CPU_BUILDDIR)/lib/ 
 ifeq (y, $(flag_build_caffe_cuda))
-	# some i386/amd64 build machines may have no video card
-	# which supports CUDA. Then heading with a dash '-'.
+	# the i386/amd64 build machine may have no CUDA-capable
+	# video card. Hence heading with a dash.
 	-dh_auto_test --builddirectory=$(CAFFE_CUDA_BUILDDIR) \
 		-- runtest LD_LIBRARY_PATH=$(CAFFE_CUDA_BUILDDIR)/lib/ 
 endif
@@ -110,19 +113,15 @@ override_dh_install:
 	dh_install --list-missing
 
 override_dh_auto_install:
-	dh_auto_install --builddirectory=$(CAFFE_CPU_BUILDDIR) \
-		-- install
+	dh_auto_install --builddirectory=$(CAFFE_CPU_BUILDDIR) -- install
 ifeq (y, $(flag_build_caffe_cuda))
-	dh_auto_install --builddirectory=$(CAFFE_CUDA_BUILDDIR) \
-		-- install
+	dh_auto_install --builddirectory=$(CAFFE_CUDA_BUILDDIR) -- install
 endif
 
 override_dh_makeshlibs:
-	dh_makeshlibs \
-		--package=python-caffe-cpu -X/usr/lib/python
+	dh_makeshlibs --package=python-caffe-cpu -X/usr/lib/python
 ifeq (y, $(flag_build_caffe_cuda))
-	dh_makeshlibs \
-		--package=python-caffe-cuda -X/usr/lib/python
+	dh_makeshlibs --package=python-caffe-cuda -X/usr/lib/python
 endif
 	dh_makeshlibs --remaining-packages
 

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