summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorColin Arnott2016-01-20 06:32:15 +0000
committerColin Arnott2016-01-20 06:32:15 +0000
commit3209942c1fae5804a42d00c82798e7950430e244 (patch)
tree04067b1683a77ef6ee5ebdf7fb1fa8d806fb161b
parent1715bb474b411e1e75a5fab94ee743876be7d150 (diff)
downloadaur-3209942c1fae5804a42d00c82798e7950430e244.tar.gz
added skype4pidgin conflict and updated version to b352617 commit
-rw-r--r--.SRCINFO5
-rw-r--r--PKGBUILD4
2 files changed, 5 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 02467e97e1e0..aa587768e527 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
# Generated by mksrcinfo v8
-# Wed Jan 6 15:42:00 UTC 2016
+# Wed Jan 20 06:32:00 UTC 2016
pkgbase = purple-skypeweb-git
pkgdesc = SkypeWeb Plugin for Pidgin
- pkgver = 20160106.v1.0.54.g623f311
+ pkgver = 20160120.1.1.11.gb352617
pkgrel = 1
url = https://github.com/EionRobb/skype4pidgin/tree/master/skypeweb
arch = any
@@ -13,6 +13,7 @@ pkgbase = purple-skypeweb-git
depends = json-glib
provides = purple-skypeweb
conflicts = purple-skypeweb
+ conflicts = skype4pidgin
source = purple-skypeweb-git::git://github.com/EionRobb/skype4pidgin
md5sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index fd1d2b283f63..eeff8c5a589b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
# Maintainer : Colin Arnott <arnottcr@gmail.com>
pkgname=purple-skypeweb-git
-pkgver=20160106.v1.0.54.g623f311
+pkgver=20160120.1.1.11.gb352617
pkgrel=1
arch=('any')
license=('GPLv3')
@@ -10,7 +10,7 @@ pkgdesc="SkypeWeb Plugin for Pidgin"
url="https://github.com/EionRobb/skype4pidgin/tree/master/skypeweb"
depends=('libpurple' 'json-glib')
makedepends=('pkg-config' 'git')
-conflicts=('purple-skypeweb')
+conflicts=('purple-skypeweb' 'skype4pidgin')
provides=('purple-skypeweb')
source=("$pkgname"::'git://github.com/EionRobb/skype4pidgin')