summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO1
-rw-r--r--PKGBUILD2
2 files changed, 2 insertions, 1 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 90eb9a1792cb..bcb57b374e7f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -60,6 +60,7 @@ pkgbase = git-annex-git
depends = util-linux
optdepends = quvi: Enable use of quvi to download videos
conflicts = git-annex
+ conflicts = git-annex-bin
options = !makeflags
pkgname = git-annex-git
diff --git a/PKGBUILD b/PKGBUILD
index ca8fe3a425c2..06f70e082b61 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -69,7 +69,7 @@ depends=(
util-linux
)
options=(!makeflags)
-conflicts=(git-annex)
+conflicts=(git-annex git-annex-bin)
makedepends=(ghc)
optdepends=('quvi: Enable use of quvi to download videos')