Both this package and the python2 version try to put files in /usr/bin/

2 files changed, 3 insertions, 1 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f8e5bc8a54ca..11af681ba381 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -10,6 +10,8 @@ pkgbase = python-pymavlink-git
 	depends = python-lxml
 	provides = python-pymavlink
 	conflicts = python-pymavlink
+	conflicts = python2-pymavlink
+	conflicts = python2-pymavlink-git
 	source = git+https://github.com/mavlink/mavlink/
 	md5sums = SKIP
 
diff --git a/PKGBUILD b/PKGBUILD
index 48a054979655..61314f80333f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,7 +12,7 @@ groups=()
 depends=('python-future' 'python-lxml')
 makedepends=('git') # 'bzr', 'git', 'mercurial' or 'subversion'
 provides=("${pkgname%-git}")
-conflicts=("${pkgname%-git}")
+conflicts=("${pkgname%-git}" "python2-pymavlink" "python2-pymavlink-git")
 replaces=()
 backup=()
 options=()