Remove conflicts array, installs to non-conflicting location. Upstream update

2 files changed, 4 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4e1871ff8c77..f6b7b5aec5a1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,8 @@
+# Generated by mksrcinfo v8
+# Sat Oct  3 02:37:53 UTC 2015
 pkgbase = dump1090-mutability-git
 	pkgdesc = ADS-B / Mode S Ground Station System for simple RTL-SDR decoding/translating. Mutability Fork
-	pkgver = 1.14.r121.g3b4c872
+	pkgver = faup1090.2.1.3.r1.gc55c71b
 	pkgrel = 1
 	url = https://github.com/mutability/dump1090
 	install = dump1090-mutability.install
@@ -17,7 +19,6 @@ pkgbase = dump1090-mutability-git
 	provides = dump1090
 	provides = fatsv-data-source
 	provides = faup1090
-	conflicts = dump1090
 	backup = etc/dump1090-mutability
 	source = dump1090-mutability-git::git://github.com/mutability/dump1090
 	source = dump1090-mutability
diff --git a/PKGBUILD b/PKGBUILD
index 94e08c6cc066..e25e2ef7d46b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=dump1090-mutability-git
 _pkgbase=dump1090-mutability
-pkgver=1.14.r121.g3b4c872
+pkgver=faup1090.2.1.3.r1.gc55c71b
 pkgrel=1
 pkgdesc="ADS-B / Mode S Ground Station System for simple RTL-SDR decoding/translating. Mutability Fork"
 arch=('armv6h' 'armv7h' 'i686' 'x86_64')
@@ -11,7 +11,6 @@ license=('GPL' 'BSD')
 depends=('rtl-sdr')
 makedepends=('git')
 provides=('dump1090' 'fatsv-data-source' 'faup1090')
-conflicts=('dump1090')
 backup=(etc/${_pkgbase})
 install=(${_pkgbase}.install)
 source=(${pkgname}::git://github.com/mutability/dump1090