summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarsten Teibes2014-03-04 16:23:51 +0100
committerCarsten Teibes2014-03-04 16:23:51 +0100
commitd1ee4290deba176a02089604dc36c08080e854d2 (patch)
tree932a9dab1e739c4bf28aee3bf3f980b0c9fb3ec5
parentc4b36d7e2d06ca253170dfd3eec65b02eef794c0 (diff)
downloadaur-d1ee4290deba176a02089604dc36c08080e854d2.tar.gz
[fix] 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 035b72269c6d..16d27e4f876d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -11,7 +11,6 @@ pkgbase = ecwolf
depends = sdl_mixer
depends = libjpeg
depends = gtk2
- conflicts = ecwolf-hg
source = http://maniacsvault.net/ecwolf/files/ecwolf/1.x/ecwolf-1.2.3-src.7z
sha256sums = 41ba154bfef4c09282d63c93f7696771458276096ea5bc9f03f0867a05a2864a
diff --git a/PKGBUILD b/PKGBUILD
index c031e34862d7..d9f6b28ea77b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,7 +9,6 @@ url="http://maniacsvault.net/ecwolf"
license=('GPL')
depends=('sdl_mixer' 'libjpeg' 'gtk2')
makedepends=('cmake')
-conflicts=('ecwolf-hg')
install=$pkgname.install
source=("http://maniacsvault.net/ecwolf/files/ecwolf/1.x/ecwolf-$pkgver-src.7z")
sha256sums=('41ba154bfef4c09282d63c93f7696771458276096ea5bc9f03f0867a05a2864a')