conflicts: added caffe2 packages

2 files changed, 9 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 018cdc72cf17..49b84ad6fd87 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Sun Apr 30 15:35:50 UTC 2017
+# Sun Apr 30 15:37:07 UTC 2017
 pkgbase = caffe-git
 	pkgdesc = A deep learning framework made with expression, speed, and modularity in mind (git version, gpu enabled)
 	pkgver = rc5.r14.gc0597b159
-	pkgrel = 2
+	pkgrel = 3
 	url = http://caffe.berkeleyvision.org/
 	arch = x86_64
 	license = BSD
@@ -48,6 +48,10 @@ pkgbase = caffe-git
 	conflicts = caffe-cpu-git
 	conflicts = caffe-dr-git
 	conflicts = caffe-mnc-dr-git
+	conflicts = caffe2
+	conflicts = caffe2-git
+	conflicts = caffe2-cpu
+	conflicts = caffe2-cpu-git
 	source = caffe-git::git+https://github.com/BVLC/caffe.git
 	sha256sums = SKIP
 
diff --git a/PKGBUILD b/PKGBUILD
index bfb887a553e1..cc22641481c8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=caffe-git
 pkgver=rc5.r14.gc0597b159
-pkgrel=2
+pkgrel=3
 pkgdesc="A deep learning framework made with expression, speed, and modularity in mind (git version, gpu enabled)"
 arch=('x86_64')
 url="http://caffe.berkeleyvision.org/"
@@ -20,7 +20,8 @@ depends=( # binary repositories:
           'python-pydot')
 makedepends=('git' 'doxygen' 'texlive-core')
 provides=('caffe')
-conflicts=('caffe' 'caffe-cpu' 'caffe-cpu-git' 'caffe-dr-git' 'caffe-mnc-dr-git')
+conflicts=('caffe' 'caffe-cpu' 'caffe-cpu-git' 'caffe-dr-git' 'caffe-mnc-dr-git'
+           'caffe2' 'caffe2-git' 'caffe2-cpu' 'caffe2-cpu-git')
 source=("${pkgname}"::"git+https://github.com/BVLC/caffe.git")
 sha256sums=('SKIP')