Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=dex77stuff.git;a=commitdiff;h=011cc25fe2ca12fbf73774a467b0b9ce91489ced
commit 011cc25fe2ca12fbf73774a467b0b9ce91489ced Author: kikadf <[email protected]> Date: Thu Feb 26 13:09:32 2015 +0100 Fix conflict in vlc diff --git a/source/xmultimedia/vlc/FrugalBuild b/source/xmultimedia/vlc/FrugalBuild index 51fc0be..8e81ac3 100644 --- a/source/xmultimedia/vlc/FrugalBuild +++ b/source/xmultimedia/vlc/FrugalBuild @@ -10,11 +10,7 @@ options+=('asneeded') pkgname=vlc pkgver=2.1.5 pkgextraver= -<<<<<<< HEAD pkgrel=3 -======= -pkgrel=6 ->>>>>>> 341de97fb84524accfccd92fe4920d9c75511903 pkgdesc="The cross-platform media player and streaming server." url="http://www.videolan.org/vlc/"; depends=('e2fsprogs' 'libxpm>=3.5.8-1' 'libxdmcp' 'libshout' 'avahi' \ @@ -120,11 +116,7 @@ subarchs=("${subarchs[@]}" 'i686 x86_64') subpkgs=("${subpkgs[@]}" 'vlc-pulseaudio') subdescs=("${subdescs[@]}" 'vlc plugin for pulseaudio') subrodepends=("${subrodepends[@]}" "$pkgname=$pkgver") -<<<<<<< HEAD subdepends=("${subdepends[@]}" "libpulse>=6.0") -======= -subdepends=("${subdepends[@]}" 'libpulse>=6.0') ->>>>>>> 341de97fb84524accfccd92fe4920d9c75511903 subgroups=("${subgroups[@]}" 'xmultimedia-extra') subarchs=("${subarchs[@]}" 'i686 x86_64') _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
