Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=dex77testing.git;a=commitdiff;h=23b91e0be0ac6f6133a6d5a1f11eb1e9179ec330
commit 23b91e0be0ac6f6133a6d5a1f11eb1e9179ec330 Merge: 574f32b f666d92 Author: DeX77 <[email protected]> Date: Fri Apr 18 13:17:41 2014 +0200 Merge ../current Conflicts: source/gnome/empathy/FrugalBuild source/gnome/gnome-shell/FrugalBuild source/xapps/firefox/FrugalBuild source/xlib-extra/spice-gtk/FrugalBuild diff --cc source/gnome/empathy/FrugalBuild index c63568f,b09e4f4..55c5fb4 --- a/source/gnome/empathy/FrugalBuild +++ b/source/gnome/empathy/FrugalBuild @@@ -10,10 -10,10 +10,10 @@@ USE_SENDTO=${USE_SENDTO:-"n" #Sendto have be merged to nautilus should wait pkgname=empathy - pkgver=3.12.0 + pkgver=3.12.1 -pkgrel=1 +pkgrel=2 pkgdesc="Empathy consists of a rich set of reusable instant messaging widgets" -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') diff --cc source/gnome/gnome-shell/FrugalBuild index 4081a66,fefecbc..32a855a --- a/source/gnome/gnome-shell/FrugalBuild +++ b/source/gnome/gnome-shell/FrugalBuild @@@ -8,8 -8,8 +8,8 @@@ USE_FRUGALTHEME=${USE_FRUGALTHEME:-"n" options+=('asneeded') pkgname=gnome-shell - pkgver=3.12.0 - pkgrel=3 + pkgver=3.12.1 -pkgrel=1 ++pkgrel=2 pkgdesc="Window management and application launching for GNOME" url="http://www.gnome.org/"; depends=('mutter>=3.12.0' 'gnome-desktop>=3.12.0' 'gjs>=1.40.0' \ diff --cc source/xapps/firefox/FrugalBuild index 26b0697,be22fd4..5938987 --- a/source/xapps/firefox/FrugalBuild +++ b/source/xapps/firefox/FrugalBuild @@@ -5,15 -5,16 +5,16 @@@ options+=('asneeded') pkgname=firefox - pkgver=27.0.1 + pkgver=28.0 pathver=${pkgver} # version used in path names -pkgrel=1 +pkgrel=2 pkgdesc="Mozilla Firefox web browser" url="http://www.mozilla.org/products/firefox/"; depends=('libevent' 'hunspell' 'libidl' 'desktop-file-utils' 'nss>=3.13.6' 'glibc>=2.6' 'dbus-glib' 'curl>=7.19.0' 'nspr>=4.9.2' \ 'lcms' 'libxau>=1.0.4' 'libxdmcp' 'libxft>=2.1.13-2' 'libxt' 'libstdc++' 'libxdamage' 'libice' 'bzip2' 'alsa-lib' \ - 'libnotify' 'wireless_tools' 'cairo' 'sqlite3>=3.7.9-2' 'startup-notification' 'libvpx' 'libpulse' 'gstreamer' \ + 'libnotify' 'wireless_tools' 'cairo' 'sqlite3>=3.7.9-2' 'startup-notification' 'libvpx' 'libpulse>=5.0' 'gstreamer' \ - 'gst-plugins-base' 'gst-plugins-ugly-x264' 'gst-plugins-ugly-mad' 'gst-plugins-bad-faad2' 'gst-plugins-good-pulseaudio') + 'gst-plugins-base' 'gst-plugins-ugly-x264' 'gst-plugins-ugly-mad' 'gst-plugins-bad-faad2' 'gst-plugins-good-pulseaudio' \ + 'gtk+2') makedepends=('zip' 'yasm') groups=('xapps') archs=('i686' 'x86_64') diff --cc source/xlib-extra/spice-gtk/FrugalBuild index 1ff8565,ec47806..42ee386 --- a/source/xlib-extra/spice-gtk/FrugalBuild +++ b/source/xlib-extra/spice-gtk/FrugalBuild @@@ -5,8 -5,8 +5,8 @@@ options+=('asneeded') pkgname=spice-gtk - pkgver=0.24 - pkgrel=3 + pkgver=0.25 -pkgrel=1 ++pkgrel=2 url="http://spice-space.org/page/Spice-Gtk"; source=(http://spice-space.org/download/gtk/$pkgname-$pkgver.tar.bz2) up2date="Flasttar http://www.spice-space.org/download/gtk/"; _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
