Conflict with bcrawl-git

2 files changed, 6 insertions, 3 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d62bc9e109d6..ad73a01f52cd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = bcrawl
 	pkgdesc = Continuation of X-Crawl fork of Dungeon Crawl Stone Soup roguelike with new content
 	pkgver = 1.10.1
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/b-crawl/bcrawl
 	arch = i686
 	arch = x86_64
@@ -25,8 +25,10 @@ pkgbase = bcrawl
 	depends = ttf-dejavu
 	optdepends = advancecomp: for recompressing the tilesheets
 	optdepends = pngcrush: for recompressing the tilesheets
+	provides = bcrawl
 	conflicts = crawl
 	conflicts = stone-soup-tile
+	conflicts = bcrawl-git
 	source = https://github.com/b-crawl/bcrawl/archive/bcrawl-1.10.1.tar.gz
 	sha256sums = 298764cba90effb21c82e8ff1f5aa58beeee704f3f188888f8d34627091fcd5f
 
diff --git a/PKGBUILD b/PKGBUILD
index 27d382b9b30f..ad9bab271ac0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=bcrawl
 pkgver=1.10.1
-pkgrel=1
+pkgrel=2
 pkgdesc='Continuation of X-Crawl fork of Dungeon Crawl Stone Soup roguelike with new content'
 arch=('i686' 'x86_64')
 url='https://github.com/b-crawl/bcrawl'
@@ -10,7 +10,8 @@ depends=('lua51' 'ncurses' 'sdl2_image' 'sqlite' 'glu' 'freetype2' 'ttf-dejavu')
 makedepends=('bison' 'flex' 'gendesk' 'mesa')
 optdepends=('advancecomp: for recompressing the tilesheets'
             'pngcrush: for recompressing the tilesheets')
-conflicts=('crawl' 'stone-soup-tile')
+conflicts=('crawl' 'stone-soup-tile' 'bcrawl-git')
+provides=('bcrawl')
 license=('GPL' 'BSD' 'MIT' 'ZLIB' 'APACHE' 'custom:CC0' 'custom')
 source=("https://github.com/b-crawl/bcrawl/archive/bcrawl-${pkgver}.tar.gz")
 sha256sums=('298764cba90effb21c82e8ff1f5aa58beeee704f3f188888f8d34627091fcd5f')