[caffe-contrib] 102/362: d/control: conflict with each other : python-caffe-{cpu, 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 ba9ce161eadd4dd0e83bb49a313e17834129841a
Author: Zhou Mo <cdluminate at gmail.com>
Date:   Tue Sep 1 03:10:17 2015 +0000

    d/control: conflict with each other : python-caffe-{cpu,cuda}
---
 debian/control | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/debian/control b/debian/control
index 051805d..dc7fd6b 100644
--- a/debian/control
+++ b/debian/control
@@ -118,6 +118,7 @@ Package: python-caffe-cpu
 Section: contrib/python
 Architecture: any
 Depends: ${python:Depends}, libcaffe-cpu0
+Conflicts: python-caffe-cuda
 Description: Fast open framework for Deep Learning (Python Interface)
  Caffe is a deep learning framework made with expression, speed, 
  and modularity in mind. It is developed by the Berkeley Vision
@@ -129,6 +130,7 @@ Package: python-caffe-cuda
 Section: contrib/python
 Architecture: i386 amd64
 Depends: ${python:Depends}, libcaffe-cuda0
+Conflicts: python-caffe-cpu
 Description: Fast open framework for Deep Learning (Python Interface)
  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