diff --git a/.SRCINFO b/.SRCINFO index 8950351..6976713 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,9 +1,9 @@ # Generated by mksrcinfo v8 -# Sun Apr 30 12:41:34 UTC 2017 +# Sun Apr 30 12:43:49 UTC 2017 pkgbase = caffe pkgdesc = A deep learning framework made with expression, speed, and modularity in mind (gpu enabled) pkgver = rc5 - pkgrel = 2 + pkgrel = 3 url = http://caffe.berkeleyvision.org/ arch = x86_64 license = BSD @@ -41,6 +41,10 @@ pkgbase = caffe 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 noextract = caffe-rc5.tar.gz source = caffe-rc5.tar.gz::https://github.com/BVLC/caffe/archive/rc.tar.gz sha256sums = 7da46e2802c5d85e41aeda79bf27e907fc317fb1ecf96800403f4a57f1cd0dfb diff --git a/PKGBUILD b/PKGBUILD index 828a8f8..334d33e 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -3,7 +3,7 @@ pkgname=caffe pkgver=rc5 -pkgrel=2 +pkgrel=3 pkgdesc="A deep learning framework made with expression, speed, and modularity in mind (gpu enabled)" arch=('x86_64') url="http://caffe.berkeleyvision.org/" @@ -17,7 +17,8 @@ depends=( # binary repositories: # AUR: 'openblas-lapack' 'python2-leveldb' 'python2-scikit-image') makedepends=('doxygen' 'texlive-core') -conflicts=('caffe-git' 'caffe-cpu' 'caffe-cpu-git' 'caffe-dr-git' 'caffe-mnc-dr-git') +conflicts=('caffe-git' 'caffe-cpu' 'caffe-cpu-git' 'caffe-dr-git' 'caffe-mnc-dr-git' + 'caffe2' 'caffe2-git' 'caffe2-cpu' 'caffe2-cpu-git') source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/BVLC/${pkgname}/archive/rc.tar.gz") noextract=("${pkgname}-${pkgver}.tar.gz") sha256sums=('7da46e2802c5d85e41aeda79bf27e907fc317fb1ecf96800403f4a57f1cd0dfb')