Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=gnometesting.git;a=commitdiff;h=96f15805576931ca6931e6d37ed61e6537109068

commit 96f15805576931ca6931e6d37ed61e6537109068
Merge: 256de7c ef01a00
Author: bouleetbil <bouleet...@frogdev.info>
Date:   Sun Apr 3 11:38:22 2011 +0200

Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current

Conflicts:
source/lib-extra/hamlib/FrugalBuild
source/xmultimedia-extra/vlc/FrugalBuild

diff --cc source/lib-extra/hamlib/FrugalBuild
index abaf686,52cc638..5dd84ba
--- a/source/lib-extra/hamlib/FrugalBuild
+++ b/source/lib-extra/hamlib/FrugalBuild
@@@ -2,11 -2,11 +2,11 @@@
# Maintainer: Devil505 <devil505li...@gmail.com>

pkgname=hamlib
- pkgver=1.2.12
+ pkgver=1.2.13
-pkgrel=1
+pkgrel=2
pkgdesc="HAM radio equipment control libraries"
makedepends=('automake' 'autoconf' 'doxygen' 'libtool' 'swig')
-depends=('perl' 'python' 'libxml2' 'libusb' 'tcl')
+depends=('perl' 'python' 'libxml2>=2.7.8' 'libusb' 'tcl')
Finclude sourceforge
groups=('lib-extra')
archs=('i686' 'x86_64')
diff --cc source/xmultimedia-extra/vlc/FrugalBuild
index 8f8ed53,3dd78fb..2f66c03
--- a/source/xmultimedia-extra/vlc/FrugalBuild
+++ b/source/xmultimedia-extra/vlc/FrugalBuild
@@@ -3,9 -3,9 +3,9 @@@
# Contributor: VMiklos <vmik...@frugalware.org>

pkgname=vlc
- pkgver=1.1.7
+ pkgver=1.1.8
pkgextraver=
- pkgrel=3
-pkgrel=1
++pkgrel=2
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.24' 'libdvdnav>=4.1.3' \
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to