kde-workspace, powerdevil: removed conflicts between themas preparation for the Plasma 5 switch

parent 3da52ece
# Maintainer: H W Tovetjärn (totte) <totte@tott.es>
# Contributors: Manuel Tortosa <manutortosa@chakra-project.org>
# Include global configuration
source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
......@@ -9,8 +6,7 @@ pkgbase="kde-workspace"
pkgname=("kde-workspace" "kde4-integration")
arch=('x86_64')
pkgver=${_workspace_ver}
#pkgver=4.11.11
pkgrel=1
pkgrel=2
url="http://www.kde.org"
license=('GPL' 'LGPL' 'FDL')
makedepends=('pkgconfig'
......@@ -60,9 +56,8 @@ options=('docs'
groups=('kde'
'kde-uninstall'
'kde-minimal')
source=("http://download.kde.org/stable/${_kdever}/src/kde-workspace-${_workspace_ver}.tar.xz"
#"http://download.kde.org/stable/${_kdever}/src/${pkgname}-$pkgver.tar.xz"
"http://download.kde.org/stable/${_kdever}/src/kde-wallpapers-${_kdever}.tar.xz"
source=("http://download.kde.org/stable/applications/${_kdever}/src/kde-workspace-${_workspace_ver}.tar.xz"
"http://download.kde.org/stable/applications/${_kdever}/src/kde-wallpapers-${_kdever}.tar.xz"
"git://anongit.kde.org/wacomtablet#tag=v2.0.2"
'kde.pam'
'kde-np.pam'
......@@ -187,14 +182,12 @@ package_kde-workspace() {
'opentp: Optional time/date sync support'
'xf86-input-wacom: Wacom tablet support')
provides=('kdebase-workspace'
'powerdevil'
'kcm_tablet=2.0.2'
'kde-workspace-doc')
replaces=('guidance-power-manager'
'kdebase-workspace'
'kde-workspace-doc')
conflicts=('kdebase-workspace'
'powerdevil'
'kcm_tablet'
'guidance-power-manager'
'kde-workspace-doc'
......
......@@ -3,14 +3,13 @@ source ../plasma.conf
pkgname=powerdevil
pkgver=${PVersion}
pkgrel=1
pkgrel=2
pkgdesc='Manages the power consumption settings of a Plasma Shell'
arch=('x86_64')
url='https://projects.kde.org/projects/kde/workspace/powerdevil'
license=('LGPL')
depends=('plasma-workspace')
depends=('plasma-workspace' 'kdelibs4support' 'kidletime')
makedepends=('extra-cmake-modules' 'kdoctools' 'python3')
conflicts=('kde-workspace')
groups=('plasma')
options=("debug")
source=("${PServer}/${pkgver}/${pkgname}-${PSubVersion}.tar.xz")
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment