Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=116019019bccb72b51f2eab2a84de69052833cea
commit 116019019bccb72b51f2eab2a84de69052833cea Merge: 0fab29f 7426ca9 Author: bouleetbil <[email protected]> Date: Sun Mar 20 15:51:55 2011 +0100 Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current Conflicts: source/multimedia/vcdimager/FrugalBuild source/xmultimedia-extra/vlc/FrugalBuild diff --cc source/multimedia/vcdimager/FrugalBuild index a8d60d8,c6cc943..7fa5b7b --- a/source/multimedia/vcdimager/FrugalBuild +++ b/source/multimedia/vcdimager/FrugalBuild @@@ -2,11 -2,11 +2,11 @@@ # Maintainer: BMH1980 <[email protected]> pkgname=vcdimager - pkgver=0.7.23 - pkgrel=5 + pkgver=0.7.24 + pkgrel=1 pkgdesc="GNU VCDImager is a full-featured mastering suite for authoring, disassembling and analyzing Video CD's and Super Video CD's." url="http://www.gnu.org/software/vcdimager/"; -depends=('libcdio>=0.81-1' 'popt' 'libxml2') +depends=('libcdio>=0.81-1' 'popt' 'libxml2>=2.7.8') Fup2gnugz source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz) license="GPL2" diff --cc source/xapps-extra/gpicview/FrugalBuild index ef1f3e5,d5b61ee..fe5b02c --- a/source/xapps-extra/gpicview/FrugalBuild +++ b/source/xapps-extra/gpicview/FrugalBuild @@@ -4,12 -3,14 +3,14 @@@ pkgname=gpicview pkgver=0.2.1 -pkgrel=2 +pkgrel=3 pkgdesc="A simple and fast image viewer for X, from the LXDE project" -depends=('gtk+2>=2.20.0-2' 'libxdamage>=1.1.1-3') +depends=('libxml2>=2.7.8' 'gtk+2>=2.20.0-2' 'libxdamage>=1.1.1-3') makedepends=('intltool') - _F_sourceforge_dirname="lxde" - Finclude sourceforge + _F_lxde_dir="GPicView%20%28image%20Viewer%29" + _F_lxde_name="GPicView" + _F_lxde_sep="%20" + Finclude lxde options=('scriptlet') groups=('xapps-extra' 'lxde-desktop') archs=('i686' 'x86_64' 'ppc') diff --cc source/xmultimedia-extra/vlc/FrugalBuild index 31fd3ef,ec6fbd1..8f8ed53 --- a/source/xmultimedia-extra/vlc/FrugalBuild +++ b/source/xmultimedia-extra/vlc/FrugalBuild @@@ -5,11 -5,11 +5,11 @@@ pkgname=vlc pkgver=1.1.7 pkgextraver= --pkgrel=2 ++pkgrel=3 pkgdesc="The cross-platform media player and streaming server." url="http://www.videolan.org/vlc/"; - depends=('hal' 'e2fsprogs' 'libxpm>=3.5.8-1' 'libxdmcp' 'libshout' 'avahi' 'libdvbpsi>=0.1.7' 'libsmbclient' 'vcdimager>=0.7.23-4' 'libdvdnav>=4.1.3' \ + depends=('hal' 'e2fsprogs' 'libxpm>=3.5.8-1' 'libxdmcp' 'libshout' 'avahi' 'libdvbpsi>=0.1.7' 'libsmbclient' 'vcdimager>=0.7.24' 'libdvdnav>=4.1.3' \ - 'alsa-lib' 'libgcrypt' 'lua' 'fribidi' 'freetype2' 'libnotify>=0.4.5-2' 'librsvg>=2.26.3' 'ffmpeg>=0.6' 'mesa>=7.7.1-1' \ + 'alsa-lib' 'libgcrypt' 'lua' 'fribidi' 'freetype2' 'librsvg>=2.26.3' 'ffmpeg>=0.6' 'mesa>=7.7.1-1' \ 'libxvmc' 'aalib' 'libmad' 'libdca' 'mpeg2dec' 'twolame' 'sdlimage' 'libqtgui' 'taglib' 'libmusicbrainz' 'libid3tag' \ 'sysfsutils' 'libmatroska' 'libmpcdec>=1.2.6-2' 'libmodplug' 'live' 'libupnp' 'libcaca') makedepends=('seamonkey' 'samba' 'cvs' 'xulrunner') _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
