set mutual conflicts for git-annex and git-annex-bin

9a0653da · Caleb Maclennan · 5d6c2006 · 9a0653da · 9a0653da
Commit 9a0653da authored Jul 08, 2014 by Caleb Maclennan
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

.SRCINFO .SRCINFO +2 -1

PKGBUILD PKGBUILD +1 -1

No files found.
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -18,7 +18,8 @@ pkgbase = git-annex-bin
 	depends = findutils
 	depends = dnsutils
 	provides = git-annex
-	conflicts = git-annex
+	conflicts = git-annex,
+	conflicts = git-annex-git
 	replaces = git-annex-standalone
 	source = git-annex
 	source = runshell.patch

--- a/PKGBUILD
+++ b/PKGBUILD
@@ -17,7 +17,7 @@ arch=('i686' 'x86_64') # 'armv6h')
 url='http://git-annex.branchable.com/'
 license=('GPL3')
 provides=('git-annex')
-conflicts=('git-annex')
+conflicts=('git-annex', 'git-annex-git')
 replaces=('git-annex-standalone')
 source=('git-annex' 'runshell.patch')
 sha256sums=('c7d12ba3f3a00736d0d22e18e76721314d461561adcf48cbd102413e5e75be92'