Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=dex77stuff.git;a=commitdiff;h=f4771b65a19e1644bbca1ec9660da37f53a612d6
commit f4771b65a19e1644bbca1ec9660da37f53a612d6 Author: kikadf <[email protected]> Date: Thu Feb 26 13:04:55 2015 +0100 * Fix conflict in kdemultimedia diff --git a/source/kde/kdemultimedia/FrugalBuild b/source/kde/kdemultimedia/FrugalBuild index fa2e8f9..290cefa 100644 --- a/source/kde/kdemultimedia/FrugalBuild +++ b/source/kde/kdemultimedia/FrugalBuild @@ -4,11 +4,7 @@ options+=('asneeded') pkgname=kdemultimedia -<<<<<<< HEAD pkgrel=5 -======= -pkgrel=3 ->>>>>>> b80be248fc6c1eb847888c10d04738a25f18f12b pkgdesc="KDE Multimedia Programs" groups=('kde') subpkgs=() @@ -46,11 +42,7 @@ subarchs=("${subarchs[@]}" 'i686 x86_64') subpkgs=("${subpkgs[@]}" "juk") subdescs=("${subdescs[@]}" "Jukebox and music manager for KDE") -<<<<<<< HEAD subdepends=("${subdepends[@]}" "libkde3support>=$_F_kde_ver phonon taglib libpulse>=6.0") -======= -subdepends=("${subdepends[@]}" "libkde3support>=$_F_kde_ver phonon taglib libpulse>=5.0") ->>>>>>> b80be248fc6c1eb847888c10d04738a25f18f12b subgroups=("${subgroups[@]}" 'kde') subreplaces=("${subreplaces[@]}" '') subarchs=("${subarchs[@]}" 'i686 x86_64') _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
