summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohannes Wienke2016-11-17 16:12:43 +0100
committerJohannes Wienke2016-11-17 16:12:43 +0100
commit3b33094ec78e0f132ac92417bce106ab87c25db3 (patch)
treeee8c1fd1f86a81868dfdbac77816e276b85c277a
parentae5da768ace372acc9d4fff518b677f96814961f (diff)
downloadaur-3b33094ec78e0f132ac92417bce106ab87c25db3.tar.gz
Conflicts
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD4
2 files changed, 6 insertions, 2 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 769038f64715..982cbb5720ee 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = rsc-stable-git
pkgdesc = Robotics Systems Commons library
pkgver = 0.15.1.c89d3c1
- pkgrel = 1
+ pkgrel = 2
url = https://projects.cor-lab.org/projects/rsc
arch = i686
arch = x86_64
@@ -9,6 +9,8 @@ pkgbase = rsc-stable-git
makedepends = git
makedepends = cmake
depends = boost
+ provides = rsc
+ conflicts = rsc
source = git+https://code.cor-lab.org/git/rsc.git#branch=0.15
md5sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 8a2317cd2f22..a913b4cbc06c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
pkgname='rsc-stable-git'
pkgver=0.15.1.c89d3c1
-pkgrel=1
+pkgrel=2
pkgdesc='Robotics Systems Commons library'
arch=('i686' 'x86_64')
url='https://projects.cor-lab.org/projects/rsc'
@@ -11,6 +11,8 @@ depends=('boost')
makedepends=('git' 'cmake')
source=("git+https://code.cor-lab.org/git/rsc.git#branch=0.15")
md5sums=('SKIP')
+conflicts=('rsc')
+provides=('rsc')
pkgver() {
cd "${srcdir}/rsc"