summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Bermond2018-10-03 22:02:24 +0000
committerDaniel Bermond2018-10-03 22:02:24 +0000
commite7b611c93ee126e60037277d874641ea681dbe03 (patch)
tree73038e0ed9d9106de50ac974fb8911349088b205
parent4d5f5b287fe456ba5dc1aa15bd18a718c59cd568 (diff)
downloadaur-e7b611c93ee126e60037277d874641ea681dbe03.tar.gz
Update conflicts
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD4
2 files changed, 3 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 146161dc26d..9186d2141b9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = caffe2-git
pkgdesc = A new lightweight, modular, and scalable deep learning framework (git version)
- pkgver = 0.8.2.r13647.ga2ebbccc9f
+ pkgver = 0.8.2.r13687.gd1ac1eba3b
pkgrel = 1
epoch = 1
url = http://caffe2.ai/
@@ -53,8 +53,6 @@ pkgbase = caffe2-git
conflicts = caffe2
conflicts = caffe2-cuda
conflicts = caffe2-cuda-git
- conflicts = caffe2-cpu
- conflicts = caffe2-cpu-git
replaces = caffe2-cpu-git
options = !emptydirs
source = pytorch-git::git+https://github.com/pytorch/pytorch.git
diff --git a/PKGBUILD b/PKGBUILD
index 5a3133384d8..6d6f4b26833 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer : Daniel Bermond < yahoo-com: danielbermond >
pkgname=caffe2-git
-pkgver=0.8.2.r13647.ga2ebbccc9f
+pkgver=0.8.2.r13687.gd1ac1eba3b
pkgrel=1
epoch=1
pkgdesc='A new lightweight, modular, and scalable deep learning framework (git version)'
@@ -29,7 +29,7 @@ depends=(
)
makedepends=('git' 'cmake')
provides=('caffe2')
-conflicts=('caffe2' 'caffe2-cuda' 'caffe2-cuda-git' 'caffe2-cpu' 'caffe2-cpu-git')
+conflicts=('caffe2' 'caffe2-cuda' 'caffe2-cuda-git')
replaces=('caffe2-cpu-git')
options=('!emptydirs')
source=(