Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=ryuotesting.git;a=commitdiff;h=1b25efdb066f5d2de32ad584fd4965ede7282a8e
commit 1b25efdb066f5d2de32ad584fd4965ede7282a8e Merge: 47e2525 ba7729b Author: Baste <[email protected]> Date: Wed Dec 21 15:31:19 2011 +0100 Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current Conflicts: source/gnome-extra/alleyoop/FrugalBuild source/gnome/folks/FrugalBuild source/gnome/nautilus/FrugalBuild source/gnome/tracker/FrugalBuild source/lib/libgda/FrugalBuild source/xlib/gdk-pixbuf2/FrugalBuild diff --cc source/gnome-extra/alleyoop/FrugalBuild index fad3992,73d9a26..f6571b6 --- a/source/gnome-extra/alleyoop/FrugalBuild +++ b/source/gnome-extra/alleyoop/FrugalBuild @@@ -2,10 -2,10 +2,10 @@@ # Maintainer: Devil505 <[email protected]> pkgname=alleyoop - pkgver=0.9.7 - pkgrel=5 + pkgver=0.9.8 + pkgrel=1 pkgdesc="A Valgrind front-end for the GNOME environment" -depends=('libglade>=2.6.4-3' 'libgnomeui' 'libsm' 'popt' 'gnome-vfs' 'esd' 'gail' 'libart_lgpl' 'atk' 'pango' 'libxau' 'libxdmcp' 'libxinerama' 'libxi' 'libxrandr' 'libxcursor' 'libxdamage' 'openssl>=1.0.0' 'util-linux' 'libstdc++' 'valgrind') +depends=('libglade>=2.6.4-3' 'libgnomeui' 'libsm' 'popt' 'gnome-vfs' 'gail' 'libart_lgpl' 'atk' 'pango' 'libxau' 'libxdmcp' 'libxinerama' 'libxi' 'libxrandr' 'libxcursor' 'libxdamage' 'openssl>=1.0.0' 'util-linux' 'libstdc++' 'valgrind') makedepends=('intltool') groups=('gnome-extra') _F_gnome_schemas=('/etc/gconf/schemas/alleyoop.schemas') diff --cc source/gnome/folks/FrugalBuild index ef520ed,1d2acd6..e4f0757 --- a/source/gnome/folks/FrugalBuild +++ b/source/gnome/folks/FrugalBuild @@@ -2,16 -2,17 +2,17 @@@ # Maintainer: bouleetbil <[email protected]> pkgname=folks - pkgver=0.6.5 - pkgrel=3 + pkgver=0.6.6 + pkgrel=1 pkgdesc="libfolks is a library that aggregates people from multiple sources" -depends=('evolution-data-server' 'libgee' 'telepathy-glib' 'libsocialweb') +depends=('evolution-data-server>=3.3.2' 'libgee' 'telepathy-glib' 'libsocialweb') makedepends=('vala' 'gobject-introspection' 'intltool' 'krb5') -groups=('gnome') +groups=('gnome' 'gnome-minimal') archs=('i686' 'x86_64') options=('scriptlet') + _F_gnome_ext=".tar.xz" Finclude gnome - sha1sums=('2eb3cd8fc18d3499720954fd751822d9d0a242e7') + sha1sums=('5e0f96dea7ac0c8afd1aac3401ecdc7aed986575') Fconfopts="$Fconfopts --enable-vala" # optimization OK diff --cc source/gnome/nautilus/FrugalBuild index 1a95a99,cc1d147..88972cc --- a/source/gnome/nautilus/FrugalBuild +++ b/source/gnome/nautilus/FrugalBuild @@@ -2,8 -2,8 +2,8 @@@ # Maintainer: bouleetbil <[email protected]> pkgname=nautilus -pkgver=3.2.1 -pkgrel=2 +pkgver=3.3.1.1 - pkgrel=2 ++pkgrel=3 pkgdesc="A file manager for GNOME" url="http://www.gnome.org/"; depends=('libxml2>=2.7.8' 'librsvg>=2.26.2-2' 'libexif' 'eject' \ _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
