Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=gnometesting.git;a=commitdiff;h=6dcc784e8410e92c8856a48d59828064fec681a9
commit 6dcc784e8410e92c8856a48d59828064fec681a9
Merge: 93365a1 762b445
Author: bouleetbil <bouleet...@frogdev.info>
Date: Wed May 11 21:47:07 2011 +0200
Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current
Conflicts:
source/gnome/eog/FrugalBuild
source/gnome/evolution/FrugalBuild
source/gnome/gnome-desktop/FrugalBuild
source/gnome/gnome-settings-daemon/FrugalBuild
source/gnome/nautilus/FrugalBuild
source/gnome/vinagre/FrugalBuild
diff --cc source/gnome/eog/FrugalBuild
index 0230d2b,d6204f2..7a653c9
--- a/source/gnome/eog/FrugalBuild
+++ b/source/gnome/eog/FrugalBuild
@@@ -3,11 -3,11 +3,11 @@@
# Contributor: Christian Hamar alias krix <kr...@linuxforum.hu>
pkgname=eog
-pkgver=3.0.1
+pkgver=3.1.1
- pkgrel=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.0.1' 'lcms' 'libart_lgpl' 'libpeas-gtk')
+ 'gnome-desktop>=3.1.1' 'lcms2' 'libart_lgpl' 'libpeas-gtk')
makedepends=('intltool' 'gnome-doc-utils>=0.16.0')
groups=('gnome')
archs=('i686' 'x86_64' 'ppc')
diff --cc source/gnome/evolution/FrugalBuild
index a02e307,6fbb779..cc227f9
--- a/source/gnome/evolution/FrugalBuild
+++ b/source/gnome/evolution/FrugalBuild
@@@ -2,11 -2,11 +2,11 @@@
# Maintainer: bouleetbil <bouleet...@frogdev.info>
pkgname=evolution
-pkgver=3.0.1
-evo_major=3.0
+pkgver=3.1.1
+evo_major=3.2
- pkgrel=1
+ pkgrel=2
pkgdesc="Integrated mail, calendar and address book suite for GNOME"
- depends=('unique' 'gst-plugins-base' 'gnome-desktop' 'libcanberra-gtk')
+ depends=('unique' 'gst-plugins-base' 'gnome-desktop' 'libcanberra-gtk'
'xcb-util>=0.3.8')
rodepends=("$pkgname-base" "$pkgname-audio")
makedepends=('intltool' 'gnome-doc-utils>=0.14.0' 'openldap' \
'psmisc' 'gnome-common' 'krb5' 'gtk-doc' 'openssl>=1.0.0')
diff --cc source/gnome/gnome-desktop/FrugalBuild
index 10df4d9,7bd3535..f436f3f
--- a/source/gnome/gnome-desktop/FrugalBuild
+++ b/source/gnome/gnome-desktop/FrugalBuild
@@@ -2,11 -2,12 +2,13 @@@
# Maintainer: bouleetbil <bouleet...@frogdev.info>
pkgname=gnome-desktop
-pkgver=3.0.1
++<<<<<<< HEAD
+pkgver=3.1.1
- pkgrel=1
+ pkgrel=2
pkgdesc="The GNOME Desktop"
url="http://www.gnome.org/";
- depends=('libxml2>=2.7.8' 'gtk+3' 'startup-notification>=0.10-2'
'rarian>=0.8.0' 'libxrandr' 'gsettings-desktop-schemas')
+ depends=('libxml2>=2.7.8' 'gtk+3' 'startup-notification>=0.10-2'
'rarian>=0.8.0' 'libxrandr' 'gsettings-desktop-schemas' \
+ 'xcb-util>=0.3.8')
makedepends=('intltool' 'gnome-doc-utils>=0.18.0' 'gtk-doc')
groups=('gnome')
archs=('i686' 'x86_64' 'ppc')
diff --cc source/gnome/gnome-settings-daemon/FrugalBuild
index 3fd1582,4ec3048..586d1ba
--- a/source/gnome/gnome-settings-daemon/FrugalBuild
+++ b/source/gnome/gnome-settings-daemon/FrugalBuild
@@@ -2,12 -2,12 +2,12 @@@
# Maintainer: bouleetbil <bouleet...@frogdev.info>
pkgname=gnome-settings-daemon
-pkgver=3.0.1
+pkgver=3.1.1
- pkgrel=1
+ pkgrel=2
pkgdesc="Utility library for accessing gnome-settings-daemon over DBUS"
depends=('libxml2>=2.7.8' 'libgnomekbd>=3.0.0' 'esd'
'gst-plugins-base>=0.10.22-2' 'libxxf86misc' \
- 'gnome-desktop>=3.0.1' 'alsa-lib' 'pulseaudio'
'gsettings-desktop-schemas' 'libxtst' 'libnotify' \
- 'gnome-icon-theme-symbolic' 'gnome-icon-theme' 'gnome-themes-standard'
'libcups' 'xcb-util>=0.3.8')
+ 'gnome-desktop>=3.1.1' 'alsa-lib' 'pulseaudio'
'gsettings-desktop-schemas' 'libxtst' 'libnotify' \
+ 'gnome-icon-theme-symbolic' 'gnome-icon-theme' 'gnome-themes-standard'
'libcups')
makedepends=('intltool' 'gtk-doc>=1.11' 'gnome-doc-utils>=0.14.0' 'cups')
rodepends=('xkbcomp')
groups=('gnome')
diff --cc source/gnome/nautilus/FrugalBuild
index 71144cc,f40b1ad..195b9dc
--- a/source/gnome/nautilus/FrugalBuild
+++ b/source/gnome/nautilus/FrugalBuild
@@@ -2,8 -2,8 +2,8 @@@
# Maintainer: bouleetbil <bouleet...@frogdev.info>
pkgname=nautilus
-pkgver=3.0.1.1
+pkgver=3.1.1
- 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'
'desktop-file-utils' 'libgnome>=2.32.0' 'gsettings-desktop-schemas' \
diff --cc source/gnome/vinagre/FrugalBuild
index 135c751,acf1e67..71f5907
--- a/source/gnome/vinagre/FrugalBuild
+++ b/source/gnome/vinagre/FrugalBuild
@@@ -2,8 -2,8 +2,8 @@@
# Maintainer: bouleetbil <bouleet...@frogdev.info>
pkgname=vinagre
-pkgver=3.0.1
+pkgver=3.1.1
- pkgrel=1
+ pkgrel=2
pkgdesc="VNC Client for the GNOME Desktop"
depends=('gtk3-vnc' 'gnutls' 'libgcrypt' 'libavahi-ui' 'atk' \
'pango' 'libxau' 'libxdmcp' 'freetype2' 'libxdamage' \
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
