Update pkgrel, add conflicts

2 files changed, 5 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8ead7959319b..5301514d3c7d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = tmxparser-git
 	pkgdesc = Library for parsing TMX files (Tiled Maps) using TinyXML's DOM interface.
 	pkgver = 124.9aa25dd
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/andrewrk/tmxparser
 	arch = i686
 	arch = x86_64
@@ -9,7 +9,7 @@ pkgbase = tmxparser-git
 	makedepends = git
 	depends = tinyxml2
 	depends = zlib
-	replaces = tmx-parser-svn
+	conflicts = tmx-parser-svn
 	options = staticlibs
 	source = tmxparser-git::git://github.com/andrewrk/tmxparser.git
 	md5sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 6e877435989b..44f23ac73433 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,14 +1,14 @@
-# Maintainer: Can Altıparmak (gulaghad) <can6dev <AT> gmail <DOT> com>
+# Maintainer: Can Altıparmak (c6parmak) <can6parmak <AT> gmail <DOT> com>
 
 pkgname=tmxparser-git
 pkgver=124.9aa25dd
-pkgrel=1
+pkgrel=2
 pkgdesc="Library for parsing TMX files (Tiled Maps) using TinyXML's DOM interface."
 url='https://github.com/andrewrk/tmxparser'
 license=('BSD')
 depends=('tinyxml2' 'zlib')
 makedepends=('git')
-replaces=('tmx-parser-svn')
+conflicts=('tmx-parser-svn')
 arch=('i686' 'x86_64')
 source=("$pkgname"::'git://github.com/andrewrk/tmxparser.git')
 md5sums=('SKIP')