Add conflict

2 files changed, 6 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 02212f5d667a..af8bc7d69237 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = trenchbroom-git
 	pkgdesc = TrenchBroom is a modern cross-platform level editor for Quake-engine based games.
 	pkgver = r5067.769b7e04d
-	pkgrel = 1
+	pkgrel = 2
 	url = http://kristianduske.com/trenchbroom
 	arch = i686
 	arch = x86_64
@@ -17,6 +17,7 @@ pkgbase = trenchbroom-git
 	depends = libxxf86vm
 	depends = glew
 	depends = glm
+	conflicts = trenchbroom
 	source = git://github.com/kduske/TrenchBroom.git
 	sha1sums = SKIP
 
diff --git a/PKGBUILD b/PKGBUILD
index 45f34c084632..76f91afc1e47 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=trenchbroom-git
 pkgver=r5067.769b7e04d
-pkgrel=1
+pkgrel=2
 pkgdesc="TrenchBroom is a modern cross-platform level editor for Quake-engine based games."
 arch=('i686' 'x86_64')
 url="http://kristianduske.com/trenchbroom"
@@ -10,6 +10,7 @@ license=('GPLv3')
 
 makedepends=('git' 'pandoc')
 depends=('freeimage' 'freetype2' 'wxgtk-trenchbroom' 'mesa' 'libgl' 'freeglut' 'libxxf86vm' 'glew' 'glm')
+conflicts=('trenchbroom')
 
 source=(git://github.com/kduske/TrenchBroom.git)
 sha1sums=('SKIP')
@@ -29,6 +30,6 @@ pkgver() {
 package() {
 	cd TrenchBroom/build
 	make DESTDIR=${pkgdir} install
-	install -Dm644 "$srcdir/TrenchBroom/app/resources/linux/trenchbroom.desktop" "$pkgdir/usr/share/applications/trenchbroom.desktop"
-	install -Dm644 "$srcdir/TrenchBroom/app/resources/linux/icons/icon_256.png" "$pkgdir/usr/share/pixmaps/trenchbroom.png"
+	install -Dm644 "${srcdir}/TrenchBroom/app/resources/linux/trenchbroom.desktop" "${pkgdir}/usr/share/applications/trenchbroom.desktop"
+	install -Dm644 "${srcdir}/TrenchBroom/app/resources/linux/icons/icon_256.png" "${pkgdir}/usr/share/pixmaps/trenchbroom.png"
 }