added prismatik-git as conflicting package

2 files changed, 6 insertions, 2 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 17199b93e4f9..c70763ac2837 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,9 @@
+# Generated by mksrcinfo v8
+# Thu Dec 10 12:17:41 UTC 2015
 pkgbase = prismatik
 	pkgdesc = A controler for usb driven LED backlights.
 	pkgver = 5.11.2
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/woodenshark/Lightpack
 	install = prismatik.install
 	arch = i686
@@ -14,6 +16,7 @@ pkgbase = prismatik
 	depends = libxkbcommon-x11
 	provides = lightpack
 	provides = prismatik
+	conflicts = prismatik-git
 	source = https://github.com/woodenshark/Lightpack/archive/5.11.2.tar.gz
 	source = include_qdatastream.patch
 	sha256sums = 09163cd082b2c49170c838f06820a13e7afb2c615e3aba523c8b46206325df43
diff --git a/PKGBUILD b/PKGBUILD
index d68ed797b3a2..ca3ed4506018 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 pkgname=prismatik
 _sname=Lightpack
 pkgver=5.11.2
-pkgrel=1
+pkgrel=2
 pkgdesc="A controler for usb driven LED backlights."
 arch=('i686' 'x86_64')
 url="https://github.com/woodenshark/Lightpack"
@@ -9,6 +9,7 @@ license=('GPL3')
 depends=('qt5-serialport' 'libxkbcommon-x11')
 makedepends=('git' 'libusb' 'pkg-config')
 provides=('lightpack' 'prismatik')
+conflicts=('prismatik-git')
 install='prismatik.install'
 source=(
     "https://github.com/woodenshark/${_sname}/archive/${pkgver}.tar.gz"