Added conflicts array

2 files changed, 3 insertions, 1 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 93586178a433..93840383045c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 # Generated by mksrcinfo v8
-# Mon Aug  7 04:41:30 UTC 2017
+# Mon Aug  7 05:00:52 UTC 2017
 pkgbase = gazebo-ogre-1.10
 	pkgdesc = A multi-robot simulator for outdoor environments (using ogre 1.10)
 	pkgver = 8.0.0
@@ -40,6 +40,7 @@ pkgbase = gazebo-ogre-1.10
 	optdepends = simbody>=3.3: Simbody support
 	optdepends = urdfdom: Load URDF files
 	provides = gazebo=8.0.0
+	conflicts = gazebo
 	source = http://osrf-distributions.s3.amazonaws.com/gazebo/releases/gazebo-8.0.0.tar.bz2
 	source = ogre-1.10.patch
 	sha256sums = ea733be6946ac5c538bf207ba01f3a6d6afa456d0b70455f7066b19d722f0d12
diff --git a/PKGBUILD b/PKGBUILD
index 1be878c8e4a5..64621e5984dd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -32,6 +32,7 @@ source=("http://osrf-distributions.s3.amazonaws.com/gazebo/releases/gazebo-${pkg
 sha256sums=('ea733be6946ac5c538bf207ba01f3a6d6afa456d0b70455f7066b19d722f0d12'
             '2fceb2e3797eb85d60b892957121cefb159d432d614a91004b6cbd9ce867b30c')
 provides=("gazebo=8.0.0")
+conflicts=("gazebo")
 
 prepare() {
   cd "${srcdir}"