Updated to latest commit (252.a1eec05)Added conflict with non-git version

2 files changed, 6 insertions, 2 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1eb8ecb2b29d..5841bddfa478 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,8 @@
+# Generated by mksrcinfo v8
+# Sun Mar 20 13:34:29 UTC 2016
 pkgbase = blingbling-git
 	pkgdesc = Fancy Widgets, Popups and signals for Awesome WM
-	pkgver = 185.694029a
+	pkgver = 252.a1eec05
 	pkgrel = 1
 	url = https://github.com/cedlemo/blingbling
 	arch = any
@@ -9,6 +11,7 @@ pkgbase = blingbling-git
 	depends = awesome
 	depends = lua-oocairo-git
 	provides = blingbling
+	conflicts = blingbling
 	source = git://github.com/cedlemo/blingbling.git
 	md5sums = SKIP
 
diff --git a/PKGBUILD b/PKGBUILD
index f17cd3804b4c..7575f037a3ef 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,5 +1,5 @@
 pkgname=blingbling-git
-pkgver=185.694029a
+pkgver=252.a1eec05
 pkgrel=1
 pkgdesc="Fancy Widgets, Popups and signals for Awesome WM"
 arch=('any')
@@ -8,6 +8,7 @@ license=('GPL2')
 depends=('awesome'
          'lua-oocairo-git')
 makedepends=('git')
+conflicts=('blingbling')
 provides=('blingbling')
 source=("git://github.com/cedlemo/blingbling.git")
 md5sums=('SKIP')