conflict with kwakd-git

2 files changed, 4 insertions, 3 deletions

diff --git a/.SRCINFO b/.SRCINFO
index fe51c40d8d80..29c025483fce 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,14 @@
 pkgbase = kwakd
 	pkgdesc = A web server serving blank html pages
 	pkgver = 0.5
-	pkgrel = 4
+	pkgrel = 5
 	url = https://code.google.com/p/kwakd/
 	install = kwakd.install
 	arch = any
 	license = GPL
 	makedepends = git
 	depends = bash
+	conflicts = kwakd-git
 	source = kwakd::https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/kwakd/kwakd-0.5.tar.gz
 	source = kwakd.service
 	sha256sums = ee87691c4ea971273a3c8926ee6f0cc754094567e27f165f890f2ce306f2afa4
diff --git a/PKGBUILD b/PKGBUILD
index d4dd91bcba2c..f933e567df42 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=kwakd
 pkgver=0.5
-pkgrel=4
+pkgrel=5
 pkgdesc="A web server serving blank html pages"
 
 url="https://code.google.com/p/kwakd/"
@@ -14,7 +14,7 @@ depends=( 'bash' )
 makedepends=(
   'git'
 )
-
+conflicts=('kwakd-git')
 source=(
   "$pkgname::https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/$pkgname/$pkgname-$pkgver.tar.gz"
   "$pkgname.service"