Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=406633e1bcf3104e76f7f9c8fcf805031a0ee32d
commit 406633e1bcf3104e76f7f9c8fcf805031a0ee32d Merge: e320a5c 3b1e44f Author: bouleetbil <[email protected]> Date: Tue Mar 29 15:07:39 2011 +0200 Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current Conflicts: source/games-extra/gelide/FrugalBuild source/gnome-extra/gnumeric/FrugalBuild source/gnome-extra/gobby/FrugalBuild source/gnome-extra/virt-manager/FrugalBuild source/lib-extra/libinfinity/FrugalBuild source/lib/libgda/FrugalBuild source/xapps-extra/filezilla/FrugalBuild source/xapps-extra/seamonkey/FrugalBuild diff --cc source/games-extra/gelide/FrugalBuild index 5b8e394,c0e1615..65932b4 --- a/source/games-extra/gelide/FrugalBuild +++ b/source/games-extra/gelide/FrugalBuild @@@ -2,10 -2,10 +2,10 @@@ # Maintainer: Devil505 <[email protected]> pkgname=gelide - pkgver=0.1.4 - pkgrel=2 + pkgver=0.1.5 + pkgrel=1 pkgdesc="Gelide is a front-end for any emulated system" -depends=('gtkmm') +depends=('gtkmm2') makedepends=('gnome-doc-utils' 'intltool') _F_gnome_iconcache="y" _F_gnome_desktop="y" diff --cc source/lib-extra/libinfinity/FrugalBuild index 1dec146,43a93d7..2e8fe92 --- a/source/lib-extra/libinfinity/FrugalBuild +++ b/source/lib-extra/libinfinity/FrugalBuild @@@ -2,11 -2,11 +2,11 @@@ # Maintainer: jercel <[email protected]> pkgname=libinfinity - pkgver=0.4.2 - pkgrel=3 + pkgver=0.5.0 + pkgrel=1 pkgdesc="libinfinity is an implementation of the Infinote protocol written in GObject-based C" url="http://gobby.0x539.de/trac/wiki/Infinote/Libinfinity"; -depends=('glib2' 'libgsasl>=1.6.0' 'libxml' 'gnutls') +depends=('libxml2>=2.7.8' 'glib2' 'libgsasl>=1.6.0' 'libxml' 'gnutls') makedepends=('avahi' 'gtk-doc' 'pkgconfig' 'gtk+2>=2.20.0-2') groups=('lib-extra') archs=('i686' 'x86_64') diff --cc source/lib/libgda/FrugalBuild index 5427443,93a52cc..c77363e --- a/source/lib/libgda/FrugalBuild +++ b/source/lib/libgda/FrugalBuild @@@ -4,11 -4,11 +4,11 @@@ pkgname=libgda pkgver=4.2.5 --pkgrel=2 ++pkgrel=3 pkgdesc="An interface to the GDA architecture" url="http://www.gnome-db.org/"; - depends=('glib2' 'libxslt' 'readline' 'popt' 'libpq' 'libmysqlclient>=5.1.34' 'libldap' 'gamin' 'libxml2>=2.7.8') - makedepends=('intltool' 'perl-xml-parser' 'db>=4.7.25' 'unixodbc' 'gtk-doc' 'openldap' 'mysql>=5.5.10' 'postgresql' 'gnome-common') + depends=('glib2' 'libxslt' 'readline' 'popt' 'libpq' 'libmysqlclient>=5.5.10' 'libldap' 'gamin') + makedepends=('intltool' 'perl-xml-parser' 'db>=4.7.25' 'unixodbc' 'gtk-doc' 'openldap' 'mysql' 'postgresql' 'gnome-common') groups=('lib') archs=('i686' 'x86_64' 'ppc') _F_gnome_scrollkeeper="y" _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
