summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJack O'Connor2016-08-05 16:55:17 -0400
committerJack O'Connor2016-08-05 16:55:33 -0400
commitecd20ba94d420e1bf4b99c3db13786eb499b6ef6 (patch)
tree44d5781746194b1a28802ba51d5851873fa93599
parent1d09feebcbf431ffea8b930c0f889ab4581c61cf (diff)
downloadaur-ecd20ba94d420e1bf4b99c3db13786eb499b6ef6.tar.gz
add conflict with the peru package
-rw-r--r--.SRCINFO5
-rw-r--r--PKGBUILD3
2 files changed, 5 insertions, 3 deletions
diff --git a/.SRCINFO b/.SRCINFO
index a5318233c695..4cf895166b07 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
# Generated by mksrcinfo v8
-# Wed May 25 22:28:01 UTC 2016
+# Fri Aug 5 20:55:08 UTC 2016
pkgbase = peru-git
pkgdesc = A tool for fetching code
- pkgver = 559.2c6a90b
+ pkgver = 579.6ad24db
pkgrel = 1
url = https://github.com/buildinspace/peru
arch = any
@@ -14,6 +14,7 @@ pkgbase = peru-git
depends = git
optdepends = mercurial: fetching from hg repos
optdepends = subversion: fetching from svn repos
+ conflicts = peru
source = git://github.com/buildinspace/peru
md5sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index bff4ba3625f5..33d2a42890ef 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=peru-git
pkgdesc='A tool for fetching code'
url='https://github.com/buildinspace/peru'
license=('MIT')
-pkgver=559.2c6a90b
+pkgver=579.6ad24db
pkgver() {
cd "$srcdir/peru"
echo $(git rev-list --count master).$(git rev-parse --short master)
@@ -19,6 +19,7 @@ optdepends=(
'mercurial: fetching from hg repos'
'subversion: fetching from svn repos'
)
+conflicts=(peru)
source=('git://github.com/buildinspace/peru')
md5sums=('SKIP')