Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=kdebump2.git;a=commitdiff;h=1683a58f35f74c2c6f15ea40e0061bcdab3c1f13
commit 1683a58f35f74c2c6f15ea40e0061bcdab3c1f13 Merge: ca32edf a529adf Author: Melko <[email protected]> Date: Tue Aug 27 16:35:47 2013 +0200 Merge remote-tracking branch 'current/master' Conflicts: source/kde/kdebase-workspace/FrugalBuild diff --cc source/kde/kdebase-workspace/FrugalBuild index f41a2fe,8d8587b..5457039 --- a/source/kde/kdebase-workspace/FrugalBuild +++ b/source/kde/kdebase-workspace/FrugalBuild @@@ -104,8 -109,9 +109,9 @@@ subdepends=("${subdepends[@]}" "libsm l libgcc xfsprogs-acl sqlite3 libqtxmlpatterns>=$Qt4") subrodepends=("${subrodepends[@]}" "") subgroups=("${subgroups[@]}" 'kde kde-core') -subreplaces=("${subreplaces[@]}" '') +subreplaces=("${subreplaces[@]}" 'libkdesolid kdebase-workspace-solid-networkmanager kdebase-workspace-solid-wicd kdebase-workspace-solid-modemmanager kdebase-workspace-solid-tools') subarchs=("${subarchs[@]}" 'i686 x86_64') + subinstall=("${subinstall[@]}" "") subpkgs=("${subpkgs[@]}" "powerdevil") subdescs=("${subdescs[@]}" "A Laptop Power Management Daemon.") @@@ -294,7 -321,20 +321,8 @@@ subrodepends=("${subrodepends[@]}" "kde subgroups=("${subgroups[@]}" 'kde kde-core') subreplaces=("${subreplaces[@]}" '') subarchs=("${subarchs[@]}" 'i686 x86_64') + subinstall=("${subinstall[@]}" "kdm.install") -## libs/solid again? kdelibs has one also .. ? -## libkde.. , or libsolid-.. ? libworkspacesolid.. ? - -subpkgs=("${subpkgs[@]}" "libkdesolid") -subdescs=("${subdescs[@]}" "Solid Control Library.") -subdepends=("${subdepends[@]}" "kdelibs-core>=$Kde4 libqtgui>=$Qt4 libqtdbus>=$Qt4 bzip2 libxext polkit-qt-1") -subrodepends=("${subrodepends[@]}" "") -subgroups=("${subgroups[@]}" 'kde kde-core') -subreplaces=("${subreplaces[@]}" '') -subarchs=("${subarchs[@]}" 'i686 x86_64') -subinstall=("${subinstall[@]}" "") - ### plasma split is the biggest work.. ### NEVER: BUMP without to check what changed .. @@@ -614,7 -706,19 +666,8 @@@ subrodepends=("${subrodepends[@]}" "" subgroups=("${subgroups[@]}" "devel-extra kde-build") subreplaces=("${subreplaces[@]}" '') subarchs=("${subarchs[@]}" "i686 x86_64") + subinstall=("${subinstall[@]}" "") -if Fuse NETWORKMANAGER; then - subpkgs=("${subpkgs[@]}" "$pkgname-solid-networkmanager") - subdescs=("${subdescs[@]}" "Solid Module for NetworkManager.") - subdepends=("${subdepends[@]}" "libxrandr libqtxml libsm networkmanager>=0.9") - subrodepends=("${subrodepends[@]}" "libkdesolid>=$Kde4") - subgroups=("${subgroups[@]}" 'kde-extra') ## for now is -extra - subreplaces=("${subreplaces[@]}" '') - subarchs=("${subarchs[@]}" 'i686 x86_64') - subinstall=("${subinstall[@]}" "") -fi - subpkgs=("${subpkgs[@]}" "$pkgname-docs") subdescs=("${subdescs[@]}" "Kdebase Workspace Documentation") subdepends=("${subdepends[@]}" '') _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
