From 1b2c8c8d4d249e93dbde959537a0c2645f5f5ce7 Mon Sep 17 00:00:00 2001 From: Daniel Bermond Date: Wed, 17 Oct 2018 23:15:48 +0000 Subject: [PATCH] Update provides and conflicts --- .SRCINFO | 4 +++- PKGBUILD | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 52170f9..0af94eb 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = caffe pkgdesc = A deep learning framework made with expression, speed, and modularity in mind (cpu only) pkgver = 1.0 - pkgrel = 11 + pkgrel = 12 url = http://caffe.berkeleyvision.org/ arch = i686 arch = x86_64 @@ -38,6 +38,8 @@ pkgbase = caffe depends = python-leveldb depends = python-scikit-image depends = python-pydotplus + provides = caffe-cpu + conflicts = caffe-cpu replaces = caffe-cpu source = caffe-1.0.tar.gz::https://github.com/BVLC/caffe/archive/1.0.tar.gz source = Makefile.config diff --git a/PKGBUILD b/PKGBUILD index d4c1695..d8fc96e 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -3,7 +3,7 @@ pkgname=caffe pkgver=1.0 -pkgrel=11 +pkgrel=12 pkgdesc='A deep learning framework made with expression, speed, and modularity in mind (cpu only)' arch=('i686' 'x86_64') url='http://caffe.berkeleyvision.org/' @@ -23,6 +23,8 @@ depends=( # https://github.com/BVLC/caffe/blob/1.0/python/caffe/draw.py#L7-L22 ) makedepends=('boost' 'doxygen' 'texlive-core') +provides=('caffe-cpu') +conflicts=('caffe-cpu') replaces=('caffe-cpu') source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/BVLC/caffe/archive/${pkgver}.tar.gz" 'Makefile.config')