[caffe-contrib] 94/362: d/control: caffe-cpu is conflicting with caffe-cuda

[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 fa984b69e6080845c5ba7a64bdee1a11f29880da
Author: Zhou Mo <cdluminate at gmail.com>
Date:   Mon Aug 31 16:29:35 2015 +0000

    d/control: caffe-cpu is conflicting with caffe-cuda
---
 debian/control | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/debian/control b/debian/control
index 67cceb0..e56b5a2 100644
--- a/debian/control
+++ b/debian/control
@@ -34,6 +34,7 @@ Multi-Arch: no
 Depends: libcaffe-cpu0 (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
+Conflicts: caffe-cuda
 Description: Fast open framework for Deep Learning (Binary, CPU_ONLY)
  Caffe is a deep learning framework made with expression, speed, 
  and modularity in mind. It is developed by the Berkeley Vision
@@ -47,6 +48,7 @@ Architecture: any
 Multi-Arch: no
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}
+Conflicts: libcaffe-cuda0
 Description: Fast open framework for Deep Learning (Library, CPU_ONLY)
  Caffe is a deep learning framework made with expression, speed, 
  and modularity in mind. It is developed by the Berkeley Vision
@@ -58,6 +60,7 @@ Package: libcaffe-cpu-dev
 Section: contrib/libdevel
 Architecture: any
 Multi-Arch: no
+Conflicts: libcaffe-cuda-dev
 Depends: libcaffe-cpu0 (= ${binary:Version}), ${misc:Depends}
 Description: Fast open framework for Deep Learning (Library Dev, CPU_ONLY)
  Caffe is a deep learning framework made with expression, speed, 
@@ -74,6 +77,7 @@ Multi-Arch: no
 Depends: libcaffe-cuda0 (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
+Conflicts: caffe-cpu
 Description: Fast open framework for Deep Learning (Binary, CUDA)
  Caffe is a deep learning framework made with expression, speed, 
  and modularity in mind. It is developed by the Berkeley Vision
@@ -88,6 +92,7 @@ Architecture: i386 amd64
 Multi-Arch: no
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}
+Conflicts: libcaffe-cpu0
 Description: Fast open framework for Deep Learning (Library, CUDA)
  Caffe is a deep learning framework made with expression, speed, 
  and modularity in mind. It is developed by the Berkeley Vision
@@ -101,6 +106,7 @@ Section: contrib/libdevel
 Architecture: i386 amd64
 Multi-Arch: no
 Depends: libcaffe-cuda0 (= ${binary:Version}), ${misc:Depends}
+Conflicts: libcaffe-cpu-dev
 Description: Fast open framework for Deep Learning (Library Dev, CUDA)
  Caffe is a deep learning framework made with expression, speed, 
  and modularity in mind. It is developed by the Berkeley Vision

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