summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorsmls2016-02-15 11:45:40 +0100
committersmls2016-02-15 11:45:40 +0100
commit7bdfdd0a0946c9f1c55007024bd02e9337fb5d82 (patch)
tree0ffccbc1fbf15e99e0b419940de7aacc74d6dac3
parent7592d42e6edd2b086f493d991faf896cb27efa90 (diff)
downloadaur-7bdfdd0a0946c9f1c55007024bd02e9337fb5d82.tar.gz
update 'conflicts' and 'replaces'
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD4
2 files changed, 4 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index b497d96a07b..56668f74b0c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
# Generated by mksrcinfo v8
-# Mon Feb 15 10:12:39 UTC 2016
+# Mon Feb 15 10:45:21 UTC 2016
pkgbase = aquaria-ose
pkgdesc = A 2D fantasy underwater action-adventure game (Open Source Edition of the engine = original v1.1.3 + many improvements)
pkgver = 1.1.3+o1.002
@@ -17,12 +17,10 @@ pkgbase = aquaria-ose
conflicts = aquaria-hib-git
conflicts = aquaria-hib-hg
conflicts = aquaria
+ conflicts = aquaria-hib
conflicts = aquaria-git
conflicts = aquaria-ose-git
- replaces = aquaria-hib-git
- replaces = aquaria-hib-hg
replaces = aquaria
- replaces = aquaria-git
source = https://github.com/AquariaOSE/Aquaria/archive/OSE-v1.002.tar.gz
source = aquaria-ose.desktop
md5sums = edb90261243611a20130b4bd9c2d6a13
diff --git a/PKGBUILD b/PKGBUILD
index 44b068f763b..a8afed8fb4e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,8 +11,8 @@ license=('GPL')
depends=('sdl2' 'openal' 'gcc-libs')
makedepends=('cmake')
optdepends=('aquaria-data-hib: Game data from the Humble Bundle release')
-conflicts=('aquaria-hib-git' 'aquaria-hib-hg' 'aquaria' 'aquaria-git' 'aquaria-ose-git')
-replaces=('aquaria-hib-git' 'aquaria-hib-hg' 'aquaria' 'aquaria-git')
+conflicts=('aquaria-hib-git' 'aquaria-hib-hg' 'aquaria' 'aquaria-hib' 'aquaria-git' 'aquaria-ose-git')
+replaces=('aquaria')
install="$pkgname.install"
_repo=Aquaria