Update conflicts

2 files changed, 8 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c8286d7315a2..867c020bf05d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -13,22 +13,19 @@ pkgbase = theshell-blueprint
 	depends = networkmanager
 	depends = xorg-xbacklight
 	depends = redshift
-	depends = tsscreenlock
 	depends = libcups
 	depends = qt5-base
 	depends = ts-qtplatform
-	depends = ts-startsession
 	depends = qt5-charts
 	depends = qt5-location
 	depends = kscreen
 	depends = kdepimlibs4
-	depends = akonadi
 	depends = ts-polkitagent
 	depends = ts-bt
 	depends = ts-bugreport
 	optdepends = alsa-utils: for volume controls
-	optdepends = pocketsphinx: for theWave
-	optdepends = festival: for theWave
+	conflicts = ts-startsession
+	replaces = ts-startsession
 	source = theshell-blueprint-7.1b::git+https://github.com/vicr123/theshell#branch=blueprint
 	md5sums = SKIP
 
diff --git a/PKGBUILD b/PKGBUILD
index da92f5bcdcfc..8ff3446f90f7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,13 +8,13 @@ arch=("x86_64")
 url="https://github.com/vicr123/theshell"
 license=('GPL3')
 depends=('kwidgetsaddons' 'xdg-utils' 'wmctrl' 'kwin' 
-'networkmanager' 'xorg-xbacklight' 'redshift' 'tsscreenlock' 
-'libcups' 'qt5-base' 'ts-qtplatform' 'ts-startsession' 'qt5-charts'
-'qt5-location' 'kscreen' 'kdepimlibs4' 'akonadi' 'ts-polkitagent' 'ts-bt' 'ts-bugreport')
-optdepends=('alsa-utils: for volume controls'
-	    'pocketsphinx: for theWave'
-	    'festival: for theWave')
+'networkmanager' 'xorg-xbacklight' 'redshift' 
+'libcups' 'qt5-base' 'ts-qtplatform' 'qt5-charts'
+'qt5-location' 'kscreen' 'kdepimlibs4' 'ts-polkitagent' 'ts-bt' 'ts-bugreport')
+optdepends=('alsa-utils: for volume controls')
 makedepends=('git')
+conflicts=('ts-startsession')
+replaces=('ts-startsession')
 source=("$pkgname-$pkgver"::'git+https://github.com/vicr123/theshell#branch=blueprint')
 md5sums=('SKIP')