Add conflicts residualvm

2 files changed, 5 insertions, 3 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1aa3899fdeda..0b3a09ac6a64 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Sat Mar 18 00:51:43 UTC 2017
+# Mon Dec 18 17:21:54 UTC 2017
 pkgbase = residualvm-git
 	pkgdesc = A cross-platform 3D game interpreter which allows you to play LucasArts' LUA-based 3D adventures
-	pkgver = r6826.6ef37506
+	pkgver = r7048.de230485
 	pkgrel = 1
 	url = http://www.residualvm.org
 	arch = i686
@@ -18,6 +18,7 @@ pkgbase = residualvm-git
 	depends = freetype2
 	depends = glew
 	depends = libjpeg-turbo
+	conflicts = residualvm
 	source = git://github.com/residualvm/residualvm.git
 	sha1sums = SKIP
 
diff --git a/PKGBUILD b/PKGBUILD
index d46a7f491908..9c82173e3ae0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,11 +2,12 @@
 
 _pkgname=residualvm
 pkgname=${_pkgname}-git
-pkgver=r6826.6ef37506
+pkgver=r7048.de230485
 pkgrel=1
 pkgdesc="A cross-platform 3D game interpreter which allows you to play LucasArts' LUA-based 3D adventures"
 arch=('i686' 'x86_64')
 url='http://www.residualvm.org'
+conflicts=('residualvm')
 license=(LGPL)
 depends=(sdl2 zlib alsa-lib libmad mesa libmpeg2 freetype2
          glew libjpeg-turbo)