[caffe-contrib] 257/362: misc update to rules, add TODO in dch

[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 fd93099626ba8654587e17a6db375977d2d05860
Author: Zhou Mo <cdluminate at gmail.com>
Date:   Tue Mar 8 15:19:32 2016 +0000

    misc update to rules, add TODO in dch
---
 debian/changelog | 4 ++++
 debian/rules     | 9 ++++-----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2538bfd..f4af551 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,9 @@
 caffe (1.0.0~rc3-1) experimental; urgency=low
 
   * Initial release. (Closes: #788539)
+  
+  * TODO:
+    + check and refresh all CONFFLAGS in rules.
+    + test custom targets.
 
  -- Zhou Mo <cdluminate at gmail.com>  Thu, 03 Sep 2015 13:56:57 +0000
diff --git a/debian/rules b/debian/rules
index b8faba0..53bc71b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,6 +16,7 @@ SUITE_CUDA   := caffe-cuda libcaffe-cuda0 libcaffe-cuda-dev python-caffe-cuda
 SUITE_CPU_P  := $(foreach PKG, $(SUITE_CPU),  --package=$(PKG))
 SUITE_CUDA_P := $(foreach PKG, $(SUITE_CUDA), --package=$(PKG))
 
+# CUDA 7.5 is available for AMD64 and PPC64EL
 ifeq (installed, $(shell dpkg -s nvidia-cuda-toolkit | grep -o installed))
 	flag_build_caffe_cuda := y
 endif
@@ -116,11 +117,9 @@ endif
 	dh_makeshlibs --remaining-packages
 
 override_dh_shlibdeps:
-	dh_shlibdeps $(SUITE_CPU_P) \
-		-- -xlibcaffe-cuda0
+	dh_shlibdeps $(SUITE_CPU_P) -- -xlibcaffe-cuda0
 ifeq (y, $(flag_build_caffe_cuda))
-	dh_shlibdeps $(SUITE_CUDA_P) \
-		-- -xlibcaffe-cpu0
+	dh_shlibdeps $(SUITE_CUDA_P) -- -xlibcaffe-cpu0
 endif
 
 get-orig-source:
@@ -135,7 +134,7 @@ get-orig-source:
 # of user's machines, it's good to provide a custom build target,
 # allowing users to build their locally performance-optimized packages.
 
-CUSTOM_JOBS   := "-j5"
+CUSTOM_JOBS   := "-j5" # number of cores plus 1
 CONFFLAG_CPU_CUSTOM = \
 	-DBLAS="Open" \
 	-DCMAKE_SKIP_RPATH=TRUE \

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