add adbfs-git to conflicts field

2 files changed, 4 insertions, 2 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0460551dc63b..ec969846358b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -9,6 +9,7 @@ pkgbase = adbfs-rootless-git
 	makedepends = git
 	depends = fuse
 	depends = android-tools
+	conflicts = adbfs-git
 	source = git+https://github.com/spion/adbfs-rootless
 	sha1sums = SKIP
 
diff --git a/PKGBUILD b/PKGBUILD
index 53d830f80b56..a886235534a6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,8 +9,9 @@ pkgdesc='fuse filesystem over adb tool for android devices, no device root requi
 arch=(i686 x86_64)
 url='https://github.com/spion/adbfs-rootless'
 license=(BSD)
-depends=(fuse android-tools)
-makedepends=(git)
+depends=('fuse' 'android-tools')
+conflicts=('adbfs-git')
+makedepends=('git')
 source=(git+https://github.com/spion/adbfs-rootless)
 sha1sums=('SKIP')