summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authordanitool2015-11-22 20:06:47 +0100
committerdanitool2015-11-22 20:06:47 +0100
commitd21ac26255eef25401758436f63ad7995fe91404 (patch)
tree9e6ca99b3051136339adece2b8ee0936e455ecda
parent9d10e3582348cd690a0bd897a86b012938774c9e (diff)
downloadaur-d21ac26255eef25401758436f63ad7995fe91404.tar.gz
add conflicts
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD1
2 files changed, 3 insertions, 0 deletions
diff --git a/.SRCINFO b/.SRCINFO
index be948a9e6f2..9d5898fdf3a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -11,6 +11,8 @@ pkgbase = kaffeine-legacy
makedepends = automoc4
depends = kdebase-runtime
depends = xine-lib
+ conflicts = kaffeine
+ conflicts = kaffeine-git
source = http://downloads.sourceforge.net/kaffeine-legacy/kaffeine-legacy-1.2.2.tar.gz
source = kaffeine-1.2.2-gcc4.7.patch
md5sums = 690e48d2e5fe123887109aa9b1bc1c31
diff --git a/PKGBUILD b/PKGBUILD
index 7f075bc705e..a4e299c69d1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,6 +11,7 @@ arch=('i686' 'x86_64')
url="http://kaffeine.kde.org"
depends=('kdebase-runtime' 'xine-lib')
makedepends=('cmake' 'automoc4')
+conflicts=('kaffeine' 'kaffeine-git')
install=kaffeine.install
source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz
kaffeine-1.2.2-gcc4.7.patch)