Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=dex77testing.git;a=commitdiff;h=596dd75498e9d337f9aa78c1402e6c231a3f0e1f
commit 596dd75498e9d337f9aa78c1402e6c231a3f0e1f Merge: 7c86399 0e251e6 Author: DeX77 <[email protected]> Date: Tue Apr 15 11:30:19 2014 +0200 Merge ../current Conflicts: source/gnome/empathy/FrugalBuild source/gnome/gnome-settings-daemon/FrugalBuild source/gnome/gnome-shell/FrugalBuild diff --cc source/gnome/empathy/FrugalBuild index cf651a2,51dfe8c..c63568f --- a/source/gnome/empathy/FrugalBuild +++ b/source/gnome/empathy/FrugalBuild @@@ -10,12 -10,12 +10,12 @@@ USE_SENDTO=${USE_SENDTO:-"n" #Sendto have be merged to nautilus should wait pkgname=empathy - pkgver=3.10.3 - pkgrel=4 + pkgver=3.12.0 -pkgrel=1 ++pkgrel=2 pkgdesc="Empathy consists of a rich set of reusable instant messaging widgets" - depends=('gtk+3' 'folks>=0.9.6-3' 'libsecret>=0.16-5' 'telepathy-logger' 'libcanberra-gtk' 'libnotify' 'pulseaudio>=5.0' \ - 'clutter-gst' 'clutter-gtk' 'telepathy-farstream' 'enchant' 'gnome-online-accounts>=3.10.2-3' 'cheese' \ - 'telepathy-mission-control' 'geoclue2' 'geocode-glib' 'libchamplain') -depends=('gtk+3' 'folks' 'libsecret' 'telepathy-logger' 'libcanberra-gtk' 'libnotify' 'pulseaudio>=2.1' \ ++depends=('gtk+3' 'folks' 'libsecret' 'telepathy-logger' 'libcanberra-gtk' 'libnotify' 'pulseaudio>=5.0' \ + 'clutter-gst' 'clutter-gtk' 'telepathy-farstream' 'enchant' 'gnome-online-accounts' 'cheese' \ + 'telepathy-mission-control' 'geoclue2' 'geocode-glib' 'libchamplain' 'telepathy-glib>=0.23.2') makedepends=('intltool' 'itstool' 'docbook-xsl') rodepends=('telepathy-gabble' 'telepathy-idle' 'telepathy-salut') groups=('gnome') diff --cc source/gnome/gnome-settings-daemon/FrugalBuild index c396c94,23af179..b5709c1 --- a/source/gnome/gnome-settings-daemon/FrugalBuild +++ b/source/gnome/gnome-settings-daemon/FrugalBuild @@@ -3,13 -3,13 +3,13 @@@ # Contributor: bouleetbil <[email protected]> pkgname=gnome-settings-daemon - pkgver=3.10.2 + pkgver=3.12.0.1 -pkgrel=1 +pkgrel=2 pkgdesc="Utility library for accessing gnome-settings-daemon over DBUS" - depends=('libxml2>=2.7.8' 'gnome-desktop>=3.10.0' 'libxxf86misc' 'gst1-plugins-base>=1.2.0' 'pulseaudio>=5.0' \ - 'libgnomekbd>=3.6.0' 'libnotify' 'libcanberra-gtk' 'libcanberra-pulseaudio' 'gsettings-desktop-schemas>=3.10.0' \ -depends=('libxml2>=2.7.8' 'gnome-desktop>=3.12.0' 'libxxf86misc' 'gst1-plugins-base>=1.2.3' 'pulseaudio>=2.1' \ ++depends=('libxml2>=2.7.8' 'gnome-desktop>=3.12.0' 'libxxf86misc' 'gst1-plugins-base>=1.2.3' 'pulseaudio>=5.0' \ + 'libgnomekbd>=3.6.0' 'libnotify' 'libcanberra-gtk' 'libcanberra-pulseaudio' 'gsettings-desktop-schemas>=3.12.0' \ 'alsa-lib' 'libcups' 'upower' 'nss' 'colord' 'libxtst' 'ibus' 'systemd>=188' 'libwacom' 'xf86-input-wacom' \ - 'librsvg' 'geocode-glib' 'libgweather>=3.10.0' 'geoclue2') + 'librsvg' 'geocode-glib>=3.12.0' 'libgweather>=3.12.0' 'geoclue2') makedepends=('intltool' 'gnome-doc-utils>=0.14.0' 'cups' 'krb5') rodepends=('xkbcomp') groups=('gnome' 'gnome-minimal') diff --cc source/gnome/gnome-shell/FrugalBuild index b46af22,ca6ceb3..4081a66 --- a/source/gnome/gnome-shell/FrugalBuild +++ b/source/gnome/gnome-shell/FrugalBuild @@@ -8,14 -8,14 +8,14 @@@ USE_FRUGALTHEME=${USE_FRUGALTHEME:-"n" options+=('asneeded') pkgname=gnome-shell - pkgver=3.10.4 + pkgver=3.12.0 -pkgrel=2 +pkgrel=3 pkgdesc="Window management and application launching for GNOME" url="http://www.gnome.org/"; - depends=('mutter>=3.10.4' 'gnome-desktop>=3.7.92' 'gjs>=1.33.3' \ + depends=('mutter>=3.12.0' 'gnome-desktop>=3.12.0' 'gjs>=1.40.0' \ 'gnome-menus>=3.5.3' 'telepathy-glib' \ - 'libsoup>=2.44.2-2' 'nm-connection-editor' 'libsecret>=0.16-5' 'gcr>=3.10.1-2' \ - 'pulseaudio>=5.0' 'caribou' 'evolution-data-server>=3.10.4-2' \ + 'libsoup' 'nm-connection-editor' 'libsecret' 'gcr' \ - 'pulseaudio>=2.1' 'caribou' 'evolution-data-server>=3.12.0' \ ++ 'pulseaudio>=5.0' 'caribou' 'evolution-data-server>=3.12.0' \ 'systemd>=188') makedepends=('intltool' 'gobject-introspection' 'krb5' 'docbook-xsl') replaces=('byzanz') _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
