Update provides and conflicts

master
Daniel Bermond 6 years ago committed by Peter Babič
parent 6836a0f35a
commit 1b2c8c8d4d
  1. 4
      .SRCINFO
  2. 4
      PKGBUILD

@ -1,7 +1,7 @@
pkgbase = caffe pkgbase = caffe
pkgdesc = A deep learning framework made with expression, speed, and modularity in mind (cpu only) pkgdesc = A deep learning framework made with expression, speed, and modularity in mind (cpu only)
pkgver = 1.0 pkgver = 1.0
pkgrel = 11 pkgrel = 12
url = http://caffe.berkeleyvision.org/ url = http://caffe.berkeleyvision.org/
arch = i686 arch = i686
arch = x86_64 arch = x86_64
@ -38,6 +38,8 @@ pkgbase = caffe
depends = python-leveldb depends = python-leveldb
depends = python-scikit-image depends = python-scikit-image
depends = python-pydotplus depends = python-pydotplus
provides = caffe-cpu
conflicts = caffe-cpu
replaces = caffe-cpu replaces = caffe-cpu
source = caffe-1.0.tar.gz::https://github.com/BVLC/caffe/archive/1.0.tar.gz source = caffe-1.0.tar.gz::https://github.com/BVLC/caffe/archive/1.0.tar.gz
source = Makefile.config source = Makefile.config

@ -3,7 +3,7 @@
pkgname=caffe pkgname=caffe
pkgver=1.0 pkgver=1.0
pkgrel=11 pkgrel=12
pkgdesc='A deep learning framework made with expression, speed, and modularity in mind (cpu only)' pkgdesc='A deep learning framework made with expression, speed, and modularity in mind (cpu only)'
arch=('i686' 'x86_64') arch=('i686' 'x86_64')
url='http://caffe.berkeleyvision.org/' url='http://caffe.berkeleyvision.org/'
@ -23,6 +23,8 @@ depends=(
# https://github.com/BVLC/caffe/blob/1.0/python/caffe/draw.py#L7-L22 # https://github.com/BVLC/caffe/blob/1.0/python/caffe/draw.py#L7-L22
) )
makedepends=('boost' 'doxygen' 'texlive-core') makedepends=('boost' 'doxygen' 'texlive-core')
provides=('caffe-cpu')
conflicts=('caffe-cpu')
replaces=('caffe-cpu') replaces=('caffe-cpu')
source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/BVLC/caffe/archive/${pkgver}.tar.gz" source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/BVLC/caffe/archive/${pkgver}.tar.gz"
'Makefile.config') 'Makefile.config')

Loading…
Cancel
Save