summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnselmo L. S. Melo2016-07-03 14:35:45 -0300
committerAnselmo L. S. Melo2016-07-03 14:35:45 -0300
commit23f98a0fd30ad9877e8d28dfdfbea4f159cfcdee (patch)
tree5aee6426e217ebc5635e6aacf5cfbde995778778
parent6a305eb766605740cfd746091020038e20e28279 (diff)
downloadaur-23f98a0fd30ad9877e8d28dfdfbea4f159cfcdee.tar.gz
Remove conflict with qgroundcontrol-git
-rw-r--r--.SRCINFO5
-rw-r--r--PKGBUILD3
2 files changed, 3 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 94e8883d82a..53eb54f1d5b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Sun Jul 3 14:04:16 UTC 2016
+# Sun Jul 3 17:35:18 UTC 2016
pkgbase = qgroundcontrol
pkgdesc = Micro air vehicle ground control station.
pkgver = 2.9.7b
- pkgrel = 1
+ pkgrel = 2
url = http://qgroundcontrol.org/
arch = any
license = GPL3
@@ -14,7 +14,6 @@ pkgbase = qgroundcontrol
depends = phonon-qt4
depends = qt5-serialport
depends = qt5-quickcontrols
- conflicts = qgroundcontrol-git
source = https://github.com/mavlink/qgroundcontrol/releases/download/v2.9.7b/qgroundcontrol.tar.bz2
md5sums = 64cad9e9597e2896602c6a1480ff9829
diff --git a/PKGBUILD b/PKGBUILD
index 5e4b694f398..195009a7ba1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,12 +1,11 @@
# Maintainer: Anselmo L. S. Melo <anselmo.melo@intel.com>
pkgname=qgroundcontrol
pkgver=2.9.7b
-pkgrel=1
+pkgrel=2
pkgdesc="Micro air vehicle ground control station."
arch=('any')
url="http://qgroundcontrol.org/"
license=('GPL3')
-conflicts=('qgroundcontrol-git')
depends=(\
'espeak' # optional but you have to decide if you want it at built-time\
'qt5-svg' 'qt5-graphicaleffects' 'qt5-webkit' 'phonon-qt4' 'qt5-serialport'\