summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarsten Teibes2014-03-04 16:23:51 +0100
committerCarsten Teibes2014-03-04 16:23:51 +0100
commit3d5f20f2a234692017c3bebc841bf44524340a0f (patch)
treeb7d2b115c38b513af04f4e48faf377c11a34d124
parenta3579235a045b5433a98b7273ee915a7297d36ba (diff)
downloadaur-3d5f20f2a234692017c3bebc841bf44524340a0f.tar.gz
Remove circular conflict
Thanks @SanskritFritz for the useful comment!
-rw-r--r--.SRCINFO1
-rw-r--r--PKGBUILD1
2 files changed, 0 insertions, 2 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 48ae5db3ae5..262bdfcc8cf 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -9,7 +9,6 @@ pkgbase = cdogs
makedepends = cmake
depends = sdl_mixer
depends = sdl_image
- conflicts = cdogs-git
source = cdogs-0.5.4.tar.gz::https://github.com/cxong/cdogs-sdl/archive/0.5.4.tar.gz
source = hqx-for-0.5.4.tar.gz::https://github.com/cxong/hqx/archive/994249c8c4d1446afd9c05654bf7eafffd7a11bb.tar.gz
source = cbehave-for-0.5.4.tar.gz::https://github.com/cxong/cbehave/archive/e90cdcf2ebaedabb8f5a2595d6edf7c823a4f196.tar.gz
diff --git a/PKGBUILD b/PKGBUILD
index 3b10dabff4c..f44d8e459ec 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -13,7 +13,6 @@ url="http://cxong.github.io/cdogs-sdl/"
license=('GPL2')
depends=('sdl_mixer' 'sdl_image')
makedepends=('cmake')
-conflicts=('cdogs-git')
source=(cdogs-$pkgver.tar.gz::"https://github.com/cxong/cdogs-sdl/archive/$pkgver.tar.gz"
hqx-for-$pkgver.tar.gz::"https://github.com/cxong/hqx/archive/994249c8c4d1446afd9c05654bf7eafffd7a11bb.tar.gz"
cbehave-for-$pkgver.tar.gz::"https://github.com/cxong/cbehave/archive/e90cdcf2ebaedabb8f5a2595d6edf7c823a4f196.tar.gz"