[caffe] 01/04: control: add octave-caffe-cpu and misc 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.

commit 5f900ed5a6e2208c963f5c488971db573539af3a
Author: Zhou Mo <cdluminate at gmail.com>
Date:   Thu Jun 30 16:12:44 2016 +0000

    control: add octave-caffe-cpu and misc update
---
 ...-completion => caffe-tools-cpu.bash-completion} |  0
 .../{caffe-cpu.install => caffe-tools-cpu.install} |  0
 ...overrides => caffe-tools-cpu.lintian-overrides} |  0
 ...caffe-cpu.manpages => caffe-tools-cpu.manpages} |  0
 debian/control                                     | 58 +++++++++++++++++++---
 5 files changed, 52 insertions(+), 6 deletions(-)

diff --git a/debian/caffe-cpu.bash-completion b/debian/caffe-tools-cpu.bash-completion
similarity index 100%
rename from debian/caffe-cpu.bash-completion
rename to debian/caffe-tools-cpu.bash-completion
diff --git a/debian/caffe-cpu.install b/debian/caffe-tools-cpu.install
similarity index 100%
rename from debian/caffe-cpu.install
rename to debian/caffe-tools-cpu.install
diff --git a/debian/caffe-cpu.lintian-overrides b/debian/caffe-tools-cpu.lintian-overrides
similarity index 100%
rename from debian/caffe-cpu.lintian-overrides
rename to debian/caffe-tools-cpu.lintian-overrides
diff --git a/debian/caffe-cpu.manpages b/debian/caffe-tools-cpu.manpages
similarity index 100%
rename from debian/caffe-cpu.manpages
rename to debian/caffe-tools-cpu.manpages
diff --git a/debian/control b/debian/control
index eb53a70..f35270f 100644
--- a/debian/control
+++ b/debian/control
@@ -3,13 +3,14 @@ Section: science
 Priority: optional
 Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
 Uploaders: Zhou Mo <cdluminate at gmail.com>
-Build-Depends-Indep: doxygen, doxygen-latex
+Build-Depends-Indep: doxygen,
+                     doxygen-latex
 Build-Depends: bc,
                cmake,
                bash-completion,
                debhelper (>=9),
                dh-python,
-# libboost-all-dev (>= 1.55) - we merely pull partial boost stack, the true B-D.
+# libboost-all-dev (>= 1.55) - we merely pull partial boost stack, the really needed part.
                libboost-filesystem-dev,
                libboost-system-dev,
                libboost-thread-dev,
@@ -21,14 +22,16 @@ Build-Depends: bc,
                liblmdb-dev,
 # switch libblas.so.3 between Atlas and OpenBLAS with update-alternatives
                libblas-dev | libblas.so,
+               liboctave-dev,
                libopencv-dev (>= 2.4),
                libprotobuf-dev,
                libprotoc-dev,
                libsnappy-dev,
+               octave-pkg-dev,
                protobuf-compiler,
+# python3 depssome of them are not B-D but we need them as runtime-deps to pass the testsuite
                python3-dev,
                python3-numpy,
-# non B-D for python3 package, but we need these Runtime-Dep to pass the testsuite
                cython3,
                ipython3,
                python3,
@@ -41,6 +44,7 @@ Build-Depends: bc,
                python3-matplotlib,
                python3-networkx,
                python3-nose,
+#              python3-opencv, # this is recommended if available but it doesn't block
                python3-pandas,
                python3-pil,
                python3-scipy,
@@ -53,13 +57,40 @@ Vcs-Git: https://anonscm.debian.org/git/debian-science/packages/caffe.git
 X-Python-Version: >= 3.3
 
 Package: caffe-cpu
+Section: metapackages
+Architecture: any
+Depends: caffe-tools-cpu   (= ${binary:Version}),
+         libcaffe-cpu1     (= ${binary:Version}),
+         python3-caffe-cpu (= ${binary:Version}),
+Suggests: libcaffe-cpu-dev (= ${binary:Version}),
+          octave-caffe-cpu (= ${binary:Version}),
+          caffe-doc        (= ${binary:Version}),
+Conflicts: caffe-cuda
+Description: Fask, open framework for Deep Learning (meta)
+ Caffe is a deep learning framework made with expression, speed,
+ and modularity in mind. It is developed by the Berkeley Vision
+ and Learning Center (BVLC) and community contributors.
+ .
+ This meta package pulls CPU_ONLY version of caffe:
+  * caffe-tools-cpu
+  * libcaffe-cpu*
+  * python3-caffe-cpu 
+ .
+ And suggests these packages:
+  * libcaffe-cpu-dev
+  * octave-caffe-cpu
+  * caffe-doc
+ .
+ Note, this CPU_ONLY version cannot co-exist with the CUDA version.
+
+Package: caffe-tools-cpu
 Architecture: any
 Multi-Arch: foreign
 Depends: libcaffe-cpu1 (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
-Conflicts: caffe-cuda
-Description: Fast, open framework for Deep Learning (CPU_ONLY)
+Conflicts: caffe-tools-cuda
+Description: Tools for fast, open framework for Deep Learning (CPU_ONLY)
  Caffe is a deep learning framework made with expression, speed,
  and modularity in mind. It is developed by the Berkeley Vision
  and Learning Center (BVLC) and community contributors.
@@ -72,7 +103,7 @@ Architecture: any
 Multi-Arch: same
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Conflicts: libcaffe-cuda1
-Description: library of Caffe, a deep learning framework (CPU_ONLY)
+Description: library of Caffe, deep learning framework (CPU_ONLY)
  Caffe is a deep learning framework made with expression, speed,
  and modularity in mind. It is developed by the Berkeley Vision
  and Learning Center (BVLC) and community contributors.
@@ -110,6 +141,21 @@ Description: Python3 interface of Caffe (CPU_ONLY)
  This package contains the python3 interface of caffe, and is configured
  as CPU_ONLY.
 
+Package: octave-caffe-cpu
+Architecture: any
+Multi-Arch: foreign
+Depends: libcaffe-cpu1 (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends},
+Conflicts: octave-caffe-cuda
+Description: Octave interface of Caffe (CPU_ONLY)
+ Caffe is a deep learning framework made with expression, speed,
+ and modularity in mind. It is developed by the Berkeley Vision
+ and Learning Center (BVLC) and community contributors.
+ .
+ This package contains the octave interface of caffe, and is configured
+ as CPU_ONLY.
+
 Package: caffe-doc
 Section: doc
 Architecture: all

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