added conflicts tag and maintainer

2 files changed, 5 insertions, 2 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 252350c85a4d..8b6594def757 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = pidgin-opensteamworks-git
 	pkgdesc = A plugin to connect to Steam Friends/Steam IM (purple plugin).
 	pkgver = 1.6.1.r8.g5c881d5
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/EionRobb/pidgin-opensteamworks
 	arch = i686
 	arch = x86_64
@@ -11,6 +11,7 @@ pkgbase = pidgin-opensteamworks-git
 	makedepends = libgnome-keyring
 	depends = libpurple
 	depends = json-glib
+	conflicts = pidgin-opensteamworks
 	replaces = pidgin-opensteamworks-svn
 	source = pidgin-opensteamworks::git+https://github.com/EionRobb/pidgin-opensteamworks.git
 	source = steam.svg
diff --git a/PKGBUILD b/PKGBUILD
index dc1837531ac7..37ef60e90133 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,10 +1,11 @@
+# Maintainer: haagch
 # Maintainer: Tinxy <arch at tinx dot eu>
 # Contributor: onny <onny at project-insanity dot org>
 
 
 pkgname=pidgin-opensteamworks-git
 pkgver=1.6.1.r8.g5c881d5
-pkgrel=1
+pkgrel=2
 pkgdesc="A plugin to connect to Steam Friends/Steam IM (purple plugin). "
 url=('https://github.com/EionRobb/pidgin-opensteamworks')
 arch=('i686' 'x86_64')
@@ -16,6 +17,7 @@ source=('pidgin-opensteamworks::git+https://github.com/EionRobb/pidgin-opensteam
 sha512sums=('SKIP'
             '34bfdf6f92cd00f9a7812d6c297d552bb05679d619ed41d4416f45043e07554d83d6fb8dcdf9361a311349e776dede2aa48b75dd208f69faf9e5638860ceab61')
 replaces=("pidgin-opensteamworks-svn") #google code repo will not be updated
+conflicts=("pidgin-opensteamworks")
 
 pkgver() {
   cd "$srcdir/pidgin-opensteamworks/steam-mobile"