Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=6746806aa01156ae5d56c6b647150f00ec25bfdf
commit 6746806aa01156ae5d56c6b647150f00ec25bfdf Merge: 3d67b92 07c1832 Author: bouleetbil <[email protected]> Date: Wed Jan 19 15:10:51 2011 +0000 Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current Conflicts: source/gnome/nautilus/FrugalBuild source/xapps/gvfs/FrugalBuild diff --cc source/gnome/nautilus/FrugalBuild index b1e6526,7f3a8d7..8bada85 --- a/source/gnome/nautilus/FrugalBuild +++ b/source/gnome/nautilus/FrugalBuild @@@ -2,13 -2,13 +2,13 @@@ # Maintainer: bouleetbil <[email protected]> pkgname=nautilus -pkgver=2.32.2.1 -pkgrel=5 +pkgver=2.91.7 - pkgrel=2 ++pkgrel=3 pkgdesc="A file manager for GNOME" url="http://www.gnome.org/"; depends=('librsvg>=2.26.2-2' 'libexif' 'eject' 'desktop-file-utils' 'libgnome>=2.32.0' 'gsettings-desktop-schemas' \ - 'exempi' 'unique>=1.0.6-3' 'gconf' 'gnome-desktop>=2.32.0' 'gail' \ + 'exempi' 'gvfs-gconf' 'unique>=2.90.0' 'gconf' 'gnome-desktop>=2.91.0' \ - 'libbeagle') + 'libbeagle' 'gvfs-gconf>=1.6.6-2' 'gvfs-gphoto2>=1.6.6-2' 'gvfs-smb>=1.6.6-2' 'gvfs>=1.6.6-2') makedepends=('intltool') groups=('gnome' 'gnome-minimal') archs=('i686' 'x86_64' 'ppc') diff --cc source/xapps/gvfs/FrugalBuild index ff8dbb3,36a333e..9fe8450 --- a/source/xapps/gvfs/FrugalBuild +++ b/source/xapps/gvfs/FrugalBuild @@@ -2,22 -2,23 +2,24 @@@ # Maintainer: bouleetbil <[email protected]> pkgname=gvfs -pkgver=1.6.6 -pkgrel=3 +pkgver=1.7.1 - pkgrel=1 ++pkgrel=2 pkgdesc="gvfs is a userspace virtual filesystem designed to work with the i/o abstractions of gio." url="http://www.gnome.org/"; - depends=('glib2>=2.20.1' 'dbus' 'avahi-glib' 'avahi' 'hal') + + #libgnome-keyring depends only of eggdbus libgcrypt dbus-glib + #Don't remove this dep or you will break gvfs + depends=('glib2>=2.20.1' 'dbus' 'avahi-glib' 'avahi' 'hal' 'libgnome-keyring' 'libarchive' 'libcdio') makedepends=('intltool' 'gnome-doc-utils' 'samba' 'fuse' 'libsoup>=2.32.0' 'gconf' \ 'gnome-keyring>=2.30.0' 'libcdio' 'gphoto2' 'obexftp>=0.23-2' \ 'bluez>=4.61' 'expat' 'openssh>=5.6p1') groups=('xapps') archs=('i686' 'x86_64' 'ppc') --Finclude gnome ++_F_gnome_glib="y" ++Finclude gnome gnome-scriptlet source=($source gvfs-libsoup.diff) -sha1sums=('066800558370187abd838c358349bb73f1579f8b' \ +sha1sums=('13b9e240b3603b4f30a9812c3d16357b190b60ab' \ '1eb9391f6bf3716ddc8fbf75340257e537c61199') - replaces=('gvfs-gconf') - provides=('gvfs-gconf') subpkgs=("${subpkgs[@]}" "gvfs-apple") subdescs=("${subdescs[@]}" "gvfs with iPhone and iPod touch support")
_______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
