tweak provides=()/conflicts=()

2 files changed, 3 insertions, 1 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 93942b8344cb..c10baae00605 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 # Generated by mksrcinfo v8
-# Wed Jan 20 08:06:12 UTC 2016
+# Wed Jan 20 11:00:49 UTC 2016
 pkgbase = ktorrent-git
 	pkgdesc = A powerful BitTorrent client. (GIT version)
 	pkgver = 5.0.0.r2202.faf83d2
@@ -27,6 +27,7 @@ pkgbase = ktorrent-git
 	optdepends = plasma-workspace: for shutdown plugin
 	optdepends = kdnssd: for zeroconf plugin
 	provides = ktorrent
+	conflicts = ktorrent-frameworks-git
 	source = git://anongit.kde.org/ktorrent.git
 	sha1sums = SKIP
 
diff --git a/PKGBUILD b/PKGBUILD
index 3ae685d8c5f3..c996d75c1931 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -28,6 +28,7 @@ optdepends=('taglib: for mediaplayer plugin'
             'kdnssd: for zeroconf plugin'
             )
 provides=('ktorrent')
+conflicts=('ktorrent-frameworks-git')
 source=('git://anongit.kde.org/ktorrent.git')
 sha1sums=('SKIP')
 install=ktorrent-git.install