Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gnometesting.git;a=commitdiff;h=1a76a4423e6f411160f4762e87991aed283468b2
commit 1a76a4423e6f411160f4762e87991aed283468b2 Merge: d9c5f43 98f518b Author: Baste <[email protected]> Date: Thu Aug 23 11:01:17 2012 +0200 Merge ../current Conflicts: source/gnome/gnome-desktop/FrugalBuild source/gnome/gnome-session/FrugalBuild source/gnome/gnome-shell/FrugalBuild source/network/networkmanager/FrugalBuild source/xlib/clutter/FrugalBuild source/xlib/gtk+3/FrugalBuild source/xlib/pango/FrugalBuild diff --cc source/gnome/gnome-session/FrugalBuild index 0c86d56,f0d1490..44adead --- a/source/gnome/gnome-session/FrugalBuild +++ b/source/gnome/gnome-session/FrugalBuild @@@ -5,12 -5,11 +5,11 @@@ USE_DEBUG=${USE_DEBUG:-"y"} pkgname=gnome-session -pkgver=3.4.2.1 -pkgrel=4 +pkgver=3.5.2 +pkgrel=1 pkgdesc="GNOME session manager" -depends=('libxml2>=2.7.8' 'gnome-desktop>=3.3.90' 'polkit' 'upower' 'gconf-gtk' 'usermode' \ - 'dbus-glib>=0.76' 'gnome-control-center>=3.3.90' 'libnotify' 'gnome-keyring>=3.0.0') +depends=('libxml2>=2.7.8' 'gnome-desktop>=3.5.3' 'polkit' 'upower' 'gconf-gtk' 'usermode' \ - 'dbus-glib>=0.76' 'gnome-control-center>=3.5.4' 'libnotify' 'gnome-keyring>=3.4.1' \ - 'metacity') ++ 'dbus-glib>=0.76' 'gnome-control-center>=3.5.4' 'libnotify' 'gnome-keyring>=3.4.1') makedepends=('intltool' 'gnome-common') #gnome-session start gnome-shell and if failed start gnome-panel rodepends=('gnome-panel' 'dconf' 'gnome-shell') diff --cc source/gnome/gnome-shell/FrugalBuild index aa6f28d,3841a9a..1a7227b --- a/source/gnome/gnome-shell/FrugalBuild +++ b/source/gnome/gnome-shell/FrugalBuild @@@ -6,16 -6,16 +6,16 @@@ USE_FRUGALTHEME=${USE_FRUGALTHEME:-"n" USE_REPLACEEXTENSIONS=${USE_REPLACEEXTENSIONS:-"n"} pkgname=gnome-shell -pkgver=3.4.2 -pkgrel=1 +pkgver=3.5.3 +pkgrel=2 pkgdesc="Window management and application launching for GNOME" url="http://www.gnome.org/"; -depends=('libxml2>=2.7.8' 'mutter>=3.3.4' 'gnome-desktop>=3.3.2' 'gjs>=1.31.10' \ - 'gnome-menus' 'librsvg>=2.31.5' 'evolution-data-server>=3.3.2' \ +depends=('libxml2>=2.7.8' 'mutter>=3.5.3' 'gnome-desktop>=3.5.3' 'gjs>=1.33.3' \ + 'gnome-menus>=3.5.3' 'librsvg>=2.31.5' 'evolution-data-server>=3.5.3' \ - 'xulrunner' 'gst-plugins-base' 'pulseaudio>=1.1' \ + 'gst-plugins-base' 'pulseaudio>=1.1' \ 'gnome-themes-standard' 'ca-certificates' \ - 'gnome-bluetooth' 'gtk+3>=3.0.8' 'telepathy-glib' 'nm-applet' \ - 'telepathy-logger>=0.2.8' 'folks>=0.6.4.1' 'json-glib>=0.13.90' \ + 'gnome-bluetooth' 'gtk+3>=3.5.6' 'telepathy-glib' 'nm-applet' \ + 'telepathy-logger>=0.2.8' 'folks>=0.7.2.2' 'json-glib>=0.15.2' \ 'gobject-introspection' 'caribou') makedepends=('intltool' 'gnome-doc-utils' 'gnome-common' \ 'krb5' 'pyatspi') diff --cc source/xlib/gtk+3/FrugalBuild index d8ba82e,7ef734e..c8a7760 --- a/source/xlib/gtk+3/FrugalBuild +++ b/source/xlib/gtk+3/FrugalBuild @@@ -123,4 -121,4 +123,3 @@@ build() } # optimization OK -- _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
