summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorKyle Keen2018-06-02 06:38:52 -0400
committerKyle Keen2018-06-02 06:38:52 -0400
commit7a2f0b14cd88fdd7eaf7dc97b99d42b008242181 (patch)
treef19cd659834b985ac56ae36973ccf59e57019871
parent23caa1175454c4184a3aff7a2683c0cb45586ccb (diff)
downloadaur-7a2f0b14cd88fdd7eaf7dc97b99d42b008242181.tar.gz
typos
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD4
2 files changed, 5 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index e5e9ba0e0593..db6f3b85b9bd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
# Generated by mksrcinfo v8
-# Sat Mar 12 20:37:52 UTC 2016
+# Sat Jun 2 10:38:49 UTC 2018
pkgbase = cataclysm-dda-git
pkgdesc = A post-apocalyptic roguelike.
pkgver = 0.C.2016.03.12
@@ -20,9 +20,9 @@ pkgbase = cataclysm-dda-git
optdepends = sdl2_ttf: for tiles
optdepends = freetype2: for tiles
optdepends = sdl2_mixer: for tiles
- conflicts = cataclysm-dda,
+ conflicts = cataclysm-dda
conflicts = cataclysm-dda-ncurses
- conflicts = cataclysm-dda-sdl-git
+ conflicts = cataclysm-dda-tiles
source = https://github.com/CleverRaven/Cataclysm-DDA/archive/master.zip
md5sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 99404d7fa89c..469374b1673e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -14,6 +14,7 @@ url="http://en.cataclysmdda.com/"
arch=('i686' 'x86_64')
license=("CCPL:by-sa")
conflicts=('cataclysm-dda')
+conflicts=('cataclysm-dda' 'cataclysm-dda-ncurses' 'cataclysm-dda-tiles')
depends=('ncurses' 'lua')
makedepends=('sdl2_image' 'sdl2_ttf' 'sdl2_mixer' 'freetype2' 'git')
optdepends=('sdl2_image: for tiles'
@@ -21,7 +22,6 @@ optdepends=('sdl2_image: for tiles'
'freetype2: for tiles'
'sdl2_mixer: for tiles')
install=cataclysm-dda.install
-conflicts=('cataclysm-dda', 'cataclysm-dda-ncurses' 'cataclysm-dda-sdl-git')
#source=("$pkgname"::'git://github.com/CleverRaven/Cataclysm-DDA.git#branch=master')
# The git repo is more than a GB
# so download a snapshot while waiting for shallow clone support in makepkg
@@ -76,7 +76,7 @@ package() {
cp -r doc/* "$pkgdir/usr/share/doc/cataclysm-dda"
# undo symlink
rm "$pkgdir/usr/share/doc/cataclysm-dda/JSON_LOADING_ORDER.md"
- cp 'data/json/LOADING_ORDER.md' "$pkgdir/usr/share/doc/cataclysm-dda/ JSON_LOADING_ORDER.md"
+ cp 'data/json/LOADING_ORDER.md' "$pkgdir/usr/share/doc/cataclysm-dda/JSON_LOADING_ORDER.md"
# License
install -Dm644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE"