Fixes

2 files changed, 6 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c87ef84173b1..93ec1e5c1e70 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = caffe-git
 	pkgdesc = A deep learning framework made with expression, speed, and modularity in mind (cpu only, git version)
 	pkgver = 1.0.r132.g99bd99795
-	pkgrel = 2
+	pkgrel = 4
 	url = http://caffe.berkeleyvision.org/
 	arch = i686
 	arch = x86_64
@@ -40,7 +40,9 @@ pkgbase = caffe-git
 	depends = python-scikit-image
 	depends = python-pydotplus
 	provides = caffe
+	provides = caffe-cpu-git
 	conflicts = caffe
+	conflicts = caffe-cpu-git
 	replaces = caffe-cpu-git
 	source = caffe-git::git+https://github.com/BVLC/caffe.git
 	source = Makefile.config
diff --git a/PKGBUILD b/PKGBUILD
index e52ff707f967..b1dbd5015340 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=caffe-git
 pkgver=1.0.r132.g99bd99795
-pkgrel=3
+pkgrel=4
 pkgdesc='A deep learning framework made with expression, speed, and modularity in mind (cpu only, git version)'
 arch=('i686' 'x86_64')
 url='http://caffe.berkeleyvision.org/'
@@ -24,8 +24,8 @@ depends=(
     # https://github.com/BVLC/caffe/blob/99bd99795dcdf0b1d3086a8d67ab1782a8a08383/python/caffe/draw.py#L7-L22
 )
 makedepends=('git' 'boost' 'doxygen' 'texlive-core')
-provides=('caffe' 'caffe-cpu')
-conflicts=('caffe' 'caffe-cpu')
+provides=('caffe' 'caffe-cpu-git')
+conflicts=('caffe' 'caffe-cpu-git')
 replaces=('caffe-cpu-git')
 source=("$pkgname"::'git+https://github.com/BVLC/caffe.git'
         'Makefile.config')