[caffe-contrib] 163/362: d/rules: fix lines that I forgot to fix.

[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 09defed687c9f590da0e584d0e96d502e0ce9258
Author: Zhou Mo <cdluminate at gmail.com>
Date:   Wed Sep 2 02:13:05 2015 +0000

    d/rules: fix lines that I forgot to fix.
---
 debian/rules | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/debian/rules b/debian/rules
index 951492b..1fff17a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -47,7 +47,6 @@ CONFFLAG_CUDA = \
 	-DCMAKE_CXX_COMPILER=g++-4.9 \
 	-DCMAKE_C_COMPILER=gcc-4.9 \
 	-DCMAKE_INSTALL_PREFIX="/caffe_cuda" \
-	-DCMAKE_INSTALL_CONFIG_NAME="Release"
 
 %:
 	dh $@ \
@@ -141,8 +140,8 @@ custom-cuda:
 	dpkg-source --before-build ./
 	dh_auto_clean --builddirectory=${CAFFE_CUDA_BUILDDIR}
 	mkdir ${CAFFE_CUDA_BUILDDIR}
-	cd ${CAFFE_CUDA_BUILDDIR}; cmake $(CONFFLAG_CPU) $(CUSTOM_CONFIG) \
-			-DCMAKE_INSTALL_PREFIX="$(shell pwd)/debian/tmp/caffe_cpu" ..
+	cd ${CAFFE_CUDA_BUILDDIR}; cmake $(CONFFLAG_CUDA) $(CUSTOM_CONFIG) \
+			-DCMAKE_INSTALL_PREFIX="$(shell pwd)/debian/tmp/caffe_cuda" ..
 	dh_auto_build --builddirectory=${CAFFE_CUDA_BUILDDIR} -- $(CUSTOM_JOBS) \
 			all caffe pycaffe test.testbin
 	dh_auto_test --builddirectory=${CAFFE_CUDA_BUILDDIR} \
@@ -154,8 +153,7 @@ custom-cuda:
 	#cd ${CAFFE_CUDA_BUILDDIR}; make install
 	$(RM) debian/*.symbols
 	fakeroot dh binary \
-		--package=caffe-cpu \
-		--package=libcaffe-cpu0 \
-		--package=libcaffe-cpu-dev \
-		--package=python-caffe-cpu
-
+		--package=caffe-cuda \
+		--package=libcaffe-cuda0 \
+		--package=libcaffe-cuda-dev \
+		--package=python-caffe-cuda

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