Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gnometesting.git;a=commitdiff;h=d10c53b63f8aaeeaaa8ef4ce7e981ef7975a22ec
commit d10c53b63f8aaeeaaa8ef4ce7e981ef7975a22ec Merge: b2ee5ed c5e408f Author: Baste <[email protected]> Date: Wed Feb 8 14:31:06 2012 +0100 Merge ../current Conflicts: source/gnome/nautilus/FrugalBuild source/gnome/tracker/FrugalBuild diff --cc source/gnome/nautilus/FrugalBuild index 735f6dd,2e3d3fe..70a60c6 --- 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=5 +pkgver=3.3.4 - pkgrel=1 ++pkgrel=2 pkgdesc="A file manager for GNOME" url="http://www.gnome.org/"; depends=('libxml2>=2.7.8' 'librsvg>=2.26.2-2' 'libexif' 'eject' \ @@@ -19,11 -19,11 +19,13 @@@ _F_gnome_glib="y _F_gnome_desktop="y" _F_gnome_mime="y" _F_gnome_iconcache="y" +_F_gnome_doc="y" +_F_gnome_ext=".tar.xz" Finclude gnome gnome-scriptlet Fconfopts="$Fconfopts --disable-packagekit --disable-nst-extension" - sha1sums=('f82eeb224e88a439534b20c2b6e3b0c3db6dde48') + source=("${source}" "no_autostart_in_KDE.patch") -sha1sums=('145a3dff7bc5050f6c1c2a98c5ad06da9d451c88' \ ++sha1sums=('f82eeb224e88a439534b20c2b6e3b0c3db6dde48' \ + '04c99d0b13113e4edf41ee3fb4d1fa04d4a13618') provides=('eel' 'nautilus-sendto') replaces=('eel' 'nautilus-wallpaper' 'nautilus-sendto' 'file-browser-applet' 'nautilus-image-converter') conflicts=('nautilus-sendto') diff --cc source/gnome/tracker/FrugalBuild index 6cc9cc3,60b8b5c..1fd6fd9 --- a/source/gnome/tracker/FrugalBuild +++ b/source/gnome/tracker/FrugalBuild @@@ -3,12 -3,12 +3,12 @@@ # Contributor: AlexExtreme <[email protected]> pkgname=tracker -pkgver=0.12.9 -pkgrel=7 +pkgver=0.13.0 - pkgrel=7 ++pkgrel=8 pkgdesc="Tracker is a first class object database, extensible tag/metadata database, search tool and indexer." depends=('dbus-glib>=0.76' 'sqlite3' \ - 'poppler-glib>=0.18.0' 'libvorbis' 'libpng' 'libexif' 'libgsf' 'gstreamer' \ - 'gnome-desktop>=3.0.0' 'exempi' 'upower>=0.9.6' 'openssl>=1.0.0' 'libkrb5') + 'poppler-glib>=0.18.1' 'libvorbis' 'libpng' 'libexif' 'libgsf' 'gstreamer' \ + 'gnome-desktop>=3.3.2' 'exempi' 'upower>=0.9.6' 'openssl>=1.0.0' 'libkrb5') rodepends=("libtracker") makedepends=('intltool' 'perl-xml-parser' 'gobject-introspection' 'krb5' 'icu4c>=4.8') groups=('gnome') @@@ -21,7 -21,9 +21,9 @@@ _F_gnome_iconcache="y _F_gnome_glib="y" _F_gnome_ext=".tar.xz" Finclude gnome-scriptlet gnome - sha1sums=('0edf65eab3248b4d56a16ee63ce70e5dd94f0b4d') + source=("${source}" "no_autostart_in_KDE.patch") -sha1sums=('b5fc5465f3da00c0b2b23cddc0f55a3d1b66d0b7' \ ++sha1sums=('0edf65eab3248b4d56a16ee63ce70e5dd94f0b4d' \ + 'e6463c596e635bf6431fad68f6d75afc79ee6f37') unset MAKEFLAGS subpkgs=("${subpkgs[@]}" "$pkgname-nautilus") _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
