[caffe-contrib] 340/362: rules,python-caffe: fix requires.txt

[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 904231976eee3ad56986912c7ca71d9786e26deb
Author: Zhou Mo <cdluminate at gmail.com>
Date:   Sat Apr 2 13:46:03 2016 +0000

    rules,python-caffe: fix requires.txt
---
 debian/python-caffe.install.in |  2 +-
 debian/rules                   | 10 ++--------
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/debian/python-caffe.install.in b/debian/python-caffe.install.in
index d2a2b2d..039bc16 100644
--- a/debian/python-caffe.install.in
+++ b/debian/python-caffe.install.in
@@ -1,2 +1,2 @@
 debian/tmp/#CAFFE_CONFIGURE#/python/caffe/*		usr/lib/python2.7/dist-packages/caffe/
-debian/tmp/#CAFFE_CONFIGURE#/python/requires.txt		usr/lib/python2.7/dist-packages/caffe/
+debian/tmp/#CAFFE_CONFIGURE#/python/requirements.txt		usr/lib/python2.7/dist-packages/caffe/
diff --git a/debian/rules b/debian/rules
index c83895a..284c1e5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -59,10 +59,9 @@ CONFFLAG_CUDA = \
 	dh $@ \
 		--parallel \
 		--buildsystem=cmake \
-		--with python2 --requires=python/requirs.txt
+		--with python2
 
 autogen:
-	ln -s python/requirments.txt python/requires.txt
 	python3 debian/template_autogen.py $(CAFFE_SOVER)
 
 override_dh_auto_configure: autogen
@@ -79,7 +78,6 @@ 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) \
@@ -102,14 +100,10 @@ ifeq (y, $(flag_build_caffe_cuda))
 endif
 
 override_dh_python2:
-	dh_python2
+	dh_python2 --requires=python/requirements.txt
 	dh_numpy
 
 override_dh_install:
-	mv debian/tmp/caffe_cpu/python/requirements.txt \
-		debian/tmp/caffe_cpu/python/requires.txt
-	mv debian/tmp/caffe_cuda/python/requirements.txt \
-		debian/tmp/caffe_cuda/python/requires.txt
 	dh_install --list-missing
 
 override_dh_auto_install:

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