file conflict was resolved upstream

This commit is contained in:
Fabian Kosmale 2015-04-11 21:51:02 +00:00
parent f5c7569650
commit b83f813353
2 changed files with 2 additions and 5 deletions

View File

@ -9,7 +9,8 @@ pkgdesc="Integrate the Bluetooth technology within KDE workspace and application
arch=('x86_64')
url='https://projects.kde.org/projects/kde/workspace/bluedevil'
license=('LGPL')
depends=('kio' 'bluez-qt5')
depends=('qt5-base' 'qt5-declarative' 'kcoreaddons' 'kwidgetsaddons' 'kdbusaddons' 'knotifications'
'kiconthemes' 'plasma-framework' 'ki18n' 'bluez-qt' 'shared-mime-info' 'kded')
makedepends=('extra-cmake-modules')
groups=('plasma')
options=("debug")

View File

@ -33,8 +33,4 @@ build() {
package() {
cd build
make DESTDIR="${pkgdir}" install
# conflicts with kde-runtime
mv "$pkgdir"/usr/share/config.kcfg/jpegcreatorsettings{,5}.kcfg
}