summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan-Erik Rediger2017-02-08 12:48:59 +0100
committerJan-Erik Rediger2017-02-08 12:49:04 +0100
commit6cb4e3fac7304c74d6803fe7d297dc90d616077a (patch)
tree575e76130c50d7a5f928246c7182716fe9672129
parentbc38c7c48cac22efb7324940e09238898a7b1d0b (diff)
downloadaur-bats-git.tar.gz
[bats-git] Add conflicts with bash-bats
-rw-r--r--.SRCINFO5
-rw-r--r--PKGBUILD3
2 files changed, 6 insertions, 2 deletions
diff --git a/.SRCINFO b/.SRCINFO
index ab0d62f88506..36364384f9cc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,15 @@
+# Generated by mksrcinfo v8
+# Wed Feb 8 11:48:48 UTC 2017
pkgbase = bats-git
pkgdesc = Bash Automated Testing System
- pkgver = v0.4.0.r5.g955309a
+ pkgver = v0.4.0.r6.g0360811
pkgrel = 1
url = https://github.com/sstephenson/bats
arch = any
license = MIT
makedepends = git
depends = bash
+ conflicts = bash-bats
source = git+https://github.com/sstephenson/bats.git
md5sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 5a0a8c79833c..35d40c62e1c9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Jan-Erik Rediger <badboy at archlinux dot us>
pkgname=bats-git
-pkgver=v0.4.0.r5.g955309a
+pkgver=v0.4.0.r6.g0360811
pkgrel=1
pkgdesc="Bash Automated Testing System"
arch=("any")
@@ -11,6 +11,7 @@ depends=('bash')
makedepends=('git')
source=('git+https://github.com/sstephenson/bats.git')
md5sums=('SKIP')
+conflicts=('bash-bats')
_gitname='bats'