summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeanbon2017-01-08 20:41:28 +0100
committerJeanbon2017-01-08 20:41:28 +0100
commit83ed33bbed518c7940a82cdbb8079381c7d94020 (patch)
treeffe14b18dce9ce61a5f262415a8880c0db6c5ed9
parent2341005ca46754dbe93172d26282aa4578894ed9 (diff)
downloadaur-83ed33bbed518c7940a82cdbb8079381c7d94020.tar.gz
Add conflict with git package
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD2
2 files changed, 3 insertions, 2 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 9c62426aed8f..7110fa6dc691 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
# Generated by mksrcinfo v8
-# Sun Jan 8 19:33:49 UTC 2017
+# Sun Jan 8 19:41:09 UTC 2017
pkgbase = lugaru
pkgdesc = A third-person action game featuring a unique close-range combat system
pkgver = 1.1
@@ -18,6 +18,7 @@ pkgbase = lugaru
depends = zlib
conflicts = lugaru-hg
conflicts = lugaruhd-hg
+ conflicts = lugaro-git
options = !optipng
source = lugaru-1.1.tar.bz2::https://gitlab.com/osslugaru/lugaru/repository/archive.tar.bz2?ref=1.1
source = lugaru.desktop
diff --git a/PKGBUILD b/PKGBUILD
index c538f6f79ad1..ff301ce29390 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,7 +8,7 @@ arch=('i686' 'x86_64')
depends=('sdl2' 'glu' 'libjpeg-turbo' 'libpng' 'openal' 'libvorbis' 'zlib')
makedepends=('cmake')
options=('!optipng')
-conflicts=('lugaru-hg' 'lugaruhd-hg')
+conflicts=('lugaru-hg' 'lugaruhd-hg' 'lugaro-git')
source=("${pkgname}-${pkgver}.tar.bz2::https://gitlab.com/osslugaru/lugaru/repository/archive.tar.bz2?ref=${pkgver}"
"${pkgname}.desktop")
sha256sums=('4372ef81494365f7227a72051960f3940acf8418006dbdb05c83d12232f481e7'