From b55b73aad4249a7153824a5ddfef177e9ea9b4bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Sun, 3 Apr 2016 18:24:42 +0200
Subject: [PATCH] qupzilla{,1}: conflict with each other

---
 srcpkgs/qupzilla/template  | 3 ++-
 srcpkgs/qupzilla1/template | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qupzilla/template b/srcpkgs/qupzilla/template
index aff1b24e161..4db663dde32 100644
--- a/srcpkgs/qupzilla/template
+++ b/srcpkgs/qupzilla/template
@@ -1,7 +1,7 @@
 # Template file for 'qupzilla'
 pkgname=qupzilla
 version=2.0.0
-revision=1
+revision=2
 wrksrc=QupZilla-${version}
 build_style=qmake
 hostmakedepends="pkg-config"
@@ -15,6 +15,7 @@ license="GPL-3"
 homepage="http://www.qupzilla.com/"
 distfiles="https://github.com/QupZilla/${pkgname}/releases/download/v${version}/QupZilla-${version}.tar.xz"
 checksum=b357e2d3de91ec833a34f958c6eb649d86113235ee27a519722d8cae58bc8c78
+conflicts="qupzilla1>=0"
 
 do_build() {
 	# Avoid  disable_parallel_build=yes by re-running make once
diff --git a/srcpkgs/qupzilla1/template b/srcpkgs/qupzilla1/template
index 3c46303e475..9e99c93eb79 100644
--- a/srcpkgs/qupzilla1/template
+++ b/srcpkgs/qupzilla1/template
@@ -1,7 +1,7 @@
 # Template file for 'qupzilla1'
 pkgname=qupzilla1
 version=1.8.9
-revision=1
+revision=2
 wrksrc=QupZilla-${version}
 build_style=qmake
 hostmakedepends="pkg-config"
@@ -14,6 +14,7 @@ license="GPL-3"
 homepage="http://www.qupzilla.com/"
 distfiles="https://github.com/QupZilla/qupzilla/releases/download/v${version}/QupZilla-${version}.tar.xz"
 checksum=620ffb10a3f6b3f596c2c38a84d9c320cb66dd2d5e6701e8e31945e26308fcac
+conflicts="qupzilla>=0"
 
 do_build() {
 	# Avoid disable_parallel_build=yes by re-running make once