[caffe-contrib] 07/11: control: import some changes from CPU version

[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 9be73409a7735df76fa6ceca70e9a176c94767d6
Author: Zhou Mo <cdluminate at gmail.com>
Date:   Mon Nov 28 02:45:12 2016 +0000

    control: import some changes from CPU version
---
 debian/changelog | 6 +++---
 debian/control   | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8ecb68c..dba9ff8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,10 +4,10 @@ caffe-contrib (1.0.0~rc3+20160930-ga7f950b-2) UNRELEASED; urgency=medium
   * Replace GCC-5 with Clang-3.8 in B-D list.
   * Remove NVCC flag "-D_FORCE_INLINES" (CUDA 7.5 workaround).
   * Refresh symbols control file for amd64.
-  * Add python3-protobuf to B-D.
   * Import files from src:caffe_1.0.0~rc3+20160930-ga7f950b-3 :
-    + autopkgtest files
-    + README.Debian
+    + autopkgtest files : general update
+    + README.Debian : general update
+    + control : add python3-protobuf to B-D; force the use of optimized BLAS.
 
  -- Zhou Mo <cdluminate at gmail.com>  Sat, 26 Nov 2016 07:18:43 +0000
 
diff --git a/debian/control b/debian/control
index 7f460b9..9c8da8c 100644
--- a/debian/control
+++ b/debian/control
@@ -34,7 +34,7 @@ Build-Depends: bc,
                ipython3,
                python3,
                python3-skimage,
-               python3-protobuf, # not available yet, FIXME before upload
+               python3-protobuf,
                python3-dateutil,
                python3-gflags,
                python3-h5py,
@@ -64,11 +64,11 @@ Architecture: amd64 ppc64el
 Depends: caffe-tools-cuda   (= ${binary:Version}),
          python3-caffe-cuda (= ${binary:Version}),
          libcaffe-cuda1     (= ${binary:Version}),
+# the default libblas.so.3 comes from pkg:libblas3, with low performance.
+         libopenblas-base | libatlas3-base | libblas.so.3 ,
          ${misc:Depends},
 Suggests: libcaffe-cuda-dev  (= ${binary:Version}),
           caffe-doc,
-# the default libblas.so.3 comes from pkg:libblas3, with low performance.
-          libopenblas-base | libatlas3-base,
 Conflicts: caffe-cpu
 Description: Fast, open framework for Deep Learning (Meta)
  Caffe is a deep learning framework made with expression, speed,

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