Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gnometesting.git;a=commitdiff;h=0feb0d930799823e5744001ff3fff0e25e5b7231
commit 0feb0d930799823e5744001ff3fff0e25e5b7231 Merge: 9165701 318ed17 Author: bouleetbil <[email protected]> Date: Tue Sep 13 16:17:16 2011 +0200 Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current Conflicts: source/gnome/evince/FrugalBuild source/gnome/rhythmbox/FrugalBuild source/gnome/totem-pl-parser/FrugalBuild source/gnome/totem/FrugalBuild source/gnome/yelp/FrugalBuild source/xlib/gobject-introspection/FrugalBuild diff --cc source/gnome/rhythmbox/FrugalBuild index ca6fff4,e207f43..4c5efc4 --- a/source/gnome/rhythmbox/FrugalBuild +++ b/source/gnome/rhythmbox/FrugalBuild @@@ -8,10 -8,10 +8,10 @@@ pkgrel= pkgdesc="A music management application for GNOME" url="http://www.rhythmbox.org/"; depends=('nautilus-brasero' 'rarian' 'desktop-file-utils' \ - 'totem>=2.90.0' 'gst-plugins-base-oil' 'avahi-glib' 'libnotify' 'libsexy' \ + 'totem>=3.0.1-2' 'gst-plugins-base-oil' 'avahi-glib' 'libnotify' 'libsexy' \ 'libsoup-gnome>=2.32.0' 'gnome-media>=2.90.0' 'dbus-glib>=0.74' 'python>=2.7' \ - 'evolution-data-server>=2.90.0' 'gnutls>=2.8' 'libgudev' 'libdmapsharing' 'webkit-gtk3' 'json-glib') -makedepends=('intltool' 'gnome-doc-utils' 'gst-python' 'libgpod>=0.6.0' 'vala' 'gtk-doc' 'gnome-common') + 'evolution-data-server>=2.90.0' 'gnutls>=2.8' 'libgudev' 'libdmapsharing' 'webkit-gtk3' 'json-glib' 'libmusicbrainz3') +makedepends=('intltool' 'gnome-doc-utils' 'gst-python' 'libgpod>=0.6.0' 'vala' 'gtk-doc' 'gnome-common' 'krb5') rodepends=('notification-daemon') replaces=('rhythmbox-desktop-art') groups=('gnome') diff --cc source/xlib/gobject-introspection/FrugalBuild index a7000af,9b0733d..a9aff9b --- a/source/xlib/gobject-introspection/FrugalBuild +++ b/source/xlib/gobject-introspection/FrugalBuild @@@ -2,10 -2,10 +2,10 @@@ # Maintainer: bouleetbil <[email protected]> pkgname=gobject-introspection -pkgver=0.10.8 -pkgrel=2 +pkgver=1.29.17 +pkgrel=1 pkgdesc="Generate interface introspection data for GObject libraries." - depends=('glib2' 'libffi' 'cairo>=1.8.10-2' 'libxft' 'python>=2.7') + depends=('glib2' 'libffi' 'cairo>=1.10.2' 'libxft' 'python>=2.7') groups=('xlib') archs=('i686' 'x86_64' 'ppc' 'arm') _F_gnome_devel="y" _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
