Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gnometesting.git;a=commitdiff;h=fe74c39caef33291c2314e55f953c29feb79196b
commit fe74c39caef33291c2314e55f953c29feb79196b Merge: 83fb907 afb2983 Author: bouleetbil <[email protected]> Date: Wed Jun 1 11:53:40 2011 +0200 Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current Conflicts: source/base/glib2/FrugalBuild source/gnome/empathy/FrugalBuild source/gnome/eog/FrugalBuild source/gnome/evolution-data-server/FrugalBuild source/gnome/evolution/FrugalBuild source/gnome/gnome-desktop/FrugalBuild source/gnome/gnome-keyring/FrugalBuild source/gnome/gnome-settings-daemon/FrugalBuild source/gnome/gnome-themes-standard/FrugalBuild source/gnome/libgnome-keyring/FrugalBuild source/gnome/nautilus/FrugalBuild source/xlib/gtk+3/FrugalBuild diff --cc source/gnome/eog/FrugalBuild index 7a653c9,fbb7f06..e5fc5c1 --- a/source/gnome/eog/FrugalBuild +++ b/source/gnome/eog/FrugalBuild @@@ -3,11 -3,11 +3,19 @@@ # Contributor: Christian Hamar alias krix <[email protected]> pkgname=eog ++<<<<<<< HEAD +pkgver=3.1.1 +pkgrel=2 +pkgdesc="An image viewing and cataloging program for GNOME" +depends=('libxml2>=2.7.8' 'libexif' 'rarian' 'desktop-file-utils' 'python>=2.7' \ + 'gnome-desktop>=3.1.1' 'lcms2' 'libart_lgpl' 'libpeas-gtk') ++======= + pkgver=3.0.2 + pkgrel=1 + pkgdesc="An image viewing and cataloging program for GNOME" + depends=('libxml2>=2.7.8' 'libexif' 'rarian' 'desktop-file-utils' 'python>=2.7' \ + 'gnome-desktop>=3.0.2' 'lcms' 'libart_lgpl' 'libpeas-gtk') ++>>>>>>> afb2983e0977b357be022fa8fe9cf08caec240f4 makedepends=('intltool' 'gnome-doc-utils>=0.16.0') groups=('gnome') archs=('i686' 'x86_64' 'ppc') @@@ -16,6 -16,6 +24,10 @@@ _F_gnome_scrollkeeper="y _F_gnome_desktop="y" _F_gnome_iconcache="y" Finclude gnome gnome-scriptlet ++<<<<<<< HEAD +sha1sums=('a7b87c39d491c3bf87aec078a81ddda3a5b1e1e6') ++======= + sha1sums=('c43cde5a62b2662f0381e7ae84417c98ae371b17') ++>>>>>>> afb2983e0977b357be022fa8fe9cf08caec240f4 # optimization OK diff --cc source/gnome/evolution-data-server/FrugalBuild index 61dc114,5652584..99089d1 --- a/source/gnome/evolution-data-server/FrugalBuild +++ b/source/gnome/evolution-data-server/FrugalBuild @@@ -6,9 -6,9 +6,9 @@@ pkgver=3.1. pkgrel=1 pkgdesc="Evolution Data Server provides a central location for addressbook and calendar in the GNOME Desktop" depends=('nss>=3.12.9' 'libsoup-gnome>=2.32.0' 'libgweather>=3.0.0' \ - 'libkrb5' 'db>=4.7.25' 'gnutls>=2.8' 'libical' 'gnome-keyring>=3.0.2' \ + 'libkrb5' 'db>=4.7.25' 'gnutls>=2.8' 'libical' 'gnome-keyring>=3.1.1' \ 'libgdata' 'gtk+3' 'libxml2>=2.7.8') - makedepends=('intltool' 'krb5' 'gperf' 'gobject-introspection' 'openldap') + makedepends=('intltool' 'krb5' 'gperf' 'gobject-introspection' 'openldap' 'vala') groups=('gnome') archs=('i686' 'x86_64' 'ppc') _F_gnome_git="n" diff --cc source/xlib/gtk+3/FrugalBuild index 8d41cb1,a51d99c..5036817 --- a/source/xlib/gtk+3/FrugalBuild +++ b/source/xlib/gtk+3/FrugalBuild @@@ -3,7 -3,7 +3,11 @@@ pkgname=gtk+3 _F_gnome_name=gtk+ ++<<<<<<< HEAD +pkgver=3.1.4 ++======= + pkgver=3.0.10 ++>>>>>>> afb2983e0977b357be022fa8fe9cf08caec240f4 pkgrel=1 pkgdesc="The GTK+ Toolkit (3.x series)" depends=('libxext' 'libxfixes' 'cairo' 'libgcc' 'libjpeg' 'libtiff' 'libcups' \ @@@ -18,7 -18,7 +22,11 @@@ Finclude gnom url="http://www.gtk.org/"; _F_cd_path="gtk+-$pkgver" source=($source im-cedilla.conf) ++<<<<<<< HEAD +sha1sums=('29b8e753406e9d9653d7f6676f7e7d9f15bdfced' \ ++======= + sha1sums=('5e8e356b87796b0a99f16a01663ec1aa972d19eb' \ ++>>>>>>> afb2983e0977b357be022fa8fe9cf08caec240f4 'f8a64241bcc873c1f1110e16306e48577a41852b') if [ "$_F_gnome_git" != "n" ]; then _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
