Added: provides, conflicts

2 files changed, 9 insertions, 3 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5d1d8487fe38..5203f0425323 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = akonadi-qt4
 	pkgdesc = PIM layer, which provides an asynchronous API to access all kind of PIM data (Qt4 version)
 	pkgver = 1.13.0
-	pkgrel = 14
+	pkgrel = 15
 	url = http://community.kde.org/KDE_PIM/Akonadi
 	arch = x86_64
 	license = LGPL
@@ -12,6 +12,9 @@ pkgbase = akonadi-qt4
 	makedepends = mariadb
 	makedepends = qt4
 	makedepends = libxslt
+	provides = akonadi
+	conflicts = akonadi
+	conflicts = akonadi-contacts
 	source = https://download.kde.org/stable/akonadi/src/akonadi-1.13.0.tar.bz2
 	source = dont-leak-old-external-payload-files.patch
 	sha256sums = 8c7f690002ea22c139f3a64394aef2e816e00ca47fd971af7d54a66087356dd2
diff --git a/PKGBUILD b/PKGBUILD
index 9ae791c2707a..2cc44195153a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,17 +1,20 @@
 # $Id$
-# Maintainer: Felix Yan <felixonmars@archlinux.org>
+# Maintainer: Felix Golatofski <contact@xdfr.de>
+# Contributor: Felix Yan <felixonmars@archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgbase=akonadi-qt4
 pkgname=(libakonadi-qt4 akonadi-qt4)
 pkgver=1.13.0
-pkgrel=14
+pkgrel=15
 pkgdesc="PIM layer, which provides an asynchronous API to access all kind of PIM data (Qt4 version)"
 arch=('x86_64')
 url='http://community.kde.org/KDE_PIM/Akonadi'
 license=('LGPL')
 makedepends=('cmake' 'automoc4' 'boost' 'postgresql' 'mariadb' 'qt4' 'libxslt')
+provides=('akonadi')
+conflicts=('akonadi' 'akonadi-contacts')
 source=("https://download.kde.org/stable/akonadi/src/akonadi-${pkgver}.tar.bz2"
         dont-leak-old-external-payload-files.patch)
 sha256sums=('8c7f690002ea22c139f3a64394aef2e816e00ca47fd971af7d54a66087356dd2'