add conflicts

2 files changed, 5 insertions, 3 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a646a3bca30e..8115bce5bf45 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -40,8 +40,10 @@ pkgbase = firestorm-nightly
 	optdepends = mesa-libgl: For Intel, Radeon, Nouveau support
 	optdepends = nvidia-libgl: for NVIDIA support
 	optdepends = nvidia-utils: for NVIDIA support
-	provides = firestorm
+	provides = firestorm-nightly
 	conflicts = firestorm-bin
+	conflicts = firestorm
+	conflicts = firestorm-beta
 	source = firestorm-nightly::hg+http://hg.phoenixviewer.com/phoenix-firestorm-lgpl
 	source = autovars
 	source = firestorm.desktop
diff --git a/PKGBUILD b/PKGBUILD
index 49641a991766..a09a41014f99 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -20,8 +20,8 @@ optdepends=(
   'nvidia-libgl: for NVIDIA support'
   'nvidia-utils: for NVIDIA support')
 makedepends=('cmake' 'gcc' 'python2-virtualenv' 'python2-pip' 'mercurial')
-conflicts=('firestorm-bin')
-provides=('firestorm')
+conflicts=('firestorm-bin' 'firestorm' 'firestorm-beta')
+provides=('firestorm-nightly')
 
 source=("$pkgname"::'hg+http://hg.phoenixviewer.com/phoenix-firestorm-lgpl' 'autovars' 'firestorm.desktop' 'firestorm.launcher')
 md5sums=('SKIP' '7245883fbdba303d4f827f60907574c6' '2158007ce43b17b72a5517fb5aeb6e66' '3daa9e24492337e62bcac318df4ab370')