Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=ryuotesting.git;a=commitdiff;h=d707c2ed6b9c283acccfc9179b4effb9c895b52d
commit d707c2ed6b9c283acccfc9179b4effb9c895b52d Merge: 7f4fd8e 2bda814 Author: bouleetbil <[email protected]> Date: Mon Jan 2 08:20:30 2012 +0100 Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current Conflicts: source/gnome-extra/anjuta/FrugalBuild source/gnome-extra/balsa/FrugalBuild source/gnome-extra/gnumeric/FrugalBuild source/gnome-extra/goffice/FrugalBuild source/gnome-extra/libchamplain/FrugalBuild source/gnome-extra/planner/FrugalBuild source/gnome/empathy/FrugalBuild source/gnome/gnome-control-center/FrugalBuild source/gnome/gnome-settings-daemon/FrugalBuild source/gnome/gnome-shell/FrugalBuild source/gnome/vinagre/FrugalBuild source/xlib/gtk+3/FrugalBuild source/xlib/xine-lib/FrugalBuild diff --cc source/gnome-extra/anjuta/FrugalBuild index 011ce38,5b6efa1..98c01d8 --- a/source/gnome-extra/anjuta/FrugalBuild +++ b/source/gnome-extra/anjuta/FrugalBuild @@@ -3,10 -3,10 +3,10 @@@ # Contributor: AlexExtreme <[email protected]> pkgname=anjuta -pkgver=3.2.2 -pkgrel=2 +pkgver=3.3.1 - pkgrel=3 ++pkgrel=4 pkgdesc="Anjuta is a versatile IDE for C and C++, written for GTK/GNOME." -depends=('gdl>=3.2.0' 'guile>=1.8.2' 'autogen' 'graphviz>=2.14-2' \ +depends=('gdl>=3.3.1' 'guile>=1.8.2' 'autogen' 'graphviz>=2.14-2' \ 'vte3' 'subversion' 'gtksourceview3' 'gnome-keyring>=2.32.0' \ 'popt' 'avahi-glib' 'libxdmcp' 'libxdamage' 'libxinerama' 'libxi' 'libxrandr' 'libxcursor' 'libxslt' \ 'ncurses' 'libxft' 'subversion' 'graphviz' 'binutils' 'glade-gtk3' 'nspr' \ diff --cc source/gnome-extra/gnumeric/FrugalBuild index 6549c9b,2979677..b9b1494 --- a/source/gnome-extra/gnumeric/FrugalBuild +++ b/source/gnome-extra/gnumeric/FrugalBuild @@@ -2,12 -2,11 +2,14 @@@ # Maintainer: bouleetbil <[email protected]> pkgname=gnumeric -pkgver=1.10.17 -pkgrel=2 +pkgver=1.11.1 +pkgrel=1 +pkgdesc="The GNOME spreadsheet" +url="http://www.gnome.org/projects/gnumeric/"; +depends=('libgnomedb>=3.99.7' 'libgda>=5.0.2' 'desktop-file-utils' \ + 'goffice>=0.9.1' 'libgsf' 'gtk+3') + pkgdesc="The GNOME spreadsheet" + url="http://www.gnome.org/projects/gnumeric/"; -depends=('libgnomedb>=3.99.7' 'libgda' 'libgsf' 'desktop-file-utils' 'goffice') makedepends=('intltool' 'pygtk>=2.14.1-2' 'rarian' 'pkgconfig') groups=('gnome-extra') archs=('i686' 'x86_64') diff --cc source/gnome-extra/libchamplain/FrugalBuild index a3d0839,9977e38..88fb123 --- a/source/gnome-extra/libchamplain/FrugalBuild +++ b/source/gnome-extra/libchamplain/FrugalBuild @@@ -2,10 -2,10 +2,10 @@@ # Maintainer: bouleetbil <[email protected]> pkgname=libchamplain - pkgver=0.12.0 - pkgrel=2 + pkgver=0.12.1 + pkgrel=1 pkgdesc="Libchamplain is a C library providing a ClutterActor to display maps." -depends=('clutter-gtk>=0.10.4-2' 'libsoup-gnome>=2.32.0' 'memphis' 'pyclutter-gtk') +depends=('clutter-gtk>=1.1.2' 'libsoup-gnome>=2.32.0' 'memphis' 'pyclutter-gtk') makedepends=('intltool' 'gnome-doc-utils' 'glproto' 'gobject-introspection' 'vala') groups=('gnome-extra') archs=('i686' 'x86_64') diff --cc source/gnome-extra/planner/FrugalBuild index 50d07c2,a4c7042..a052785 --- a/source/gnome-extra/planner/FrugalBuild +++ b/source/gnome-extra/planner/FrugalBuild @@@ -2,11 -2,11 +2,11 @@@ # Maintainer: bouleetbil <[email protected]> pkgname=planner - pkgver=0.14.5 - pkgrel=2 + pkgver=0.14.6 + pkgrel=1 pkgdesc="Project manager for Gnome2" depends=('libjpeg>=8a' 'openssl>=1.0.0' 'gtk+2>=2.20.0-2' 'libgnomecanvas' 'libgnomeui' 'libsm' \ - 'esd' 'libglade>=2.6.4-2' 'libgnomeprintui>=2.18.2-3' 'gail' 'atk' 'cairo' 'freetype2' \ + 'libglade>=2.6.4-2' 'libgnomeprintui>=2.18.2-3' 'gail' 'atk' 'cairo' 'freetype2' \ 'libxau>=1.0.4' 'libxdmcp' 'gnome-vfs' 'libxdamage' 'libxinerama' 'libxi' \ 'libxrandr' 'libxcursor' 'gconf' 'libxml2>=2.7.8' 'libxslt' 'pygtk>=2.14.1-2') makedepends=('pkgconfig' 'intltool' 'rarian') diff --cc source/gnome/empathy/FrugalBuild index a80be8c,53145c8..2dc07dc --- a/source/gnome/empathy/FrugalBuild +++ b/source/gnome/empathy/FrugalBuild @@@ -7,19 -7,19 +7,20 @@@ USE_SENDTO=${USE_SENDTO:-"n" #Sendto have be merged to nautilus should wait pkgname=empathy -pkgver=3.2.2 ++<<<<<<< HEAD +pkgver=3.3.3 - pkgrel=1 + pkgrel=2 pkgdesc="Empathy consists of a rich set of reusable instant messaging widgets" -depends=('telepathy-glib' 'libxml2' 'enchant' 'ca-certificates' \ +depends=('telepathy-glib>=0.17.3' 'libxml2' 'enchant' 'ca-certificates' \ 'atk' 'pango' 'freetype2' 'libxau' 'libxdmcp' 'e2fsprogs' \ - 'popt' 'nspr' 'openssl' 'libxdamage' 'libxinerama' \ - 'libxi' 'libxrandr' 'libxcursor' 'libjpeg' \ - 'libsm' 'libffi' 'gnome-keyring' 'cogl' \ + 'popt' 'nspr' 'openssl>=1.0.0' 'libxdamage' 'libxinerama' \ + 'libxi' 'libxrandr' 'libxcursor' 'libjpeg>=8a' \ + 'libsm' 'libffi' 'gnome-keyring>=3.1.90' 'gdbm>=1.10' \ 'aspell' 'iso-codes' 'telepathy-mission-control' 'telepathy-gabble' \ - 'evolution-data-server>=3.2.1' 'libcanberra-gtk' 'telepathy-farsight' \ - 'webkit-gtk3' 'unique' 'libkrb5' 'folks>=0.6.4.1' 'telepathy-logger' \ + 'evolution-data-server' 'libcanberra-gtk' 'telepathy-farsight' \ + 'webkit-gtk3' 'unique' 'libkrb5' 'folks>=0.6.6' 'telepathy-logger' \ 'ca-certificates' 'gsettings-desktop-schemas' 'libnotify>=0.7' 'telepathy-butterfly' \ - 'telepathy-logger>=0.2.8' 'networkmanager' 'glib-networking' 'pulseaudio>=1.1' 'cheese') + 'telepathy-logger>=0.2.8' 'networkmanager' 'glib-networking' 'pulseaudio>=1.1' 'cheese>=3.3.2') makedepends=('gnome-common' 'intltool' 'gtk-doc' 'gnome-doc-utils' 'krb5' 'libxtst') groups=('gnome') archs=('i686' 'x86_64') diff --cc source/gnome/gnome-control-center/FrugalBuild index 7a357e6,ca07310..4d9ce31 --- a/source/gnome/gnome-control-center/FrugalBuild +++ b/source/gnome/gnome-control-center/FrugalBuild @@@ -4,8 -4,8 +4,9 @@@ USE_CHEESE=${USE_CHEESE:-"y"} pkgname=gnome-control-center -pkgver=3.2.2 ++<<<<<<< HEAD +pkgver=3.3.2 - pkgrel=1 + pkgrel=2 pkgdesc="GNOME Control Center" depends=('libxml2>=2.7.8' 'gnome-desktop>=3.2.1' 'mutter' 'libgnomekbd>=3.0.0' 'gnome-menus' \ 'nautilus>=3.2.0' 'gst-plugins-base>=0.10.19-2' 'desktop-file-utils' \ diff --cc source/gnome/gnome-settings-daemon/FrugalBuild index 3b5b5a1,8ef3495..78d8c6f --- a/source/gnome/gnome-settings-daemon/FrugalBuild +++ b/source/gnome/gnome-settings-daemon/FrugalBuild @@@ -2,8 -2,8 +2,8 @@@ # Maintainer: bouleetbil <[email protected]> pkgname=gnome-settings-daemon -pkgver=3.2.2 +pkgver=3.3.2 - pkgrel=1 + pkgrel=2 pkgdesc="Utility library for accessing gnome-settings-daemon over DBUS" depends=('libxml2>=2.7.8' 'libgnomekbd>=3.1.0' 'gst-plugins-base>=0.10.22-2' 'libxxf86misc' \ 'gnome-desktop>=3.2.1' 'alsa-lib' 'pulseaudio>=1.1' 'gsettings-desktop-schemas' 'libxtst' 'libnotify' \ diff --cc source/gnome/gnome-shell/FrugalBuild index 1c49f5d,ec6dcaf..1913f38 --- a/source/gnome/gnome-shell/FrugalBuild +++ b/source/gnome/gnome-shell/FrugalBuild @@@ -5,12 -5,12 +5,12 @@@ USE_FRUGALTHEME=${USE_FRUGALTHEME:-"y" USE_REPLACEEXTENSIONS=${USE_REPLACEEXTENSIONS:-"y"} pkgname=gnome-shell -pkgver=3.2.1 -pkgrel=7 +pkgver=3.3.2 - pkgrel=3 ++pkgrel=4 pkgdesc="Window management and application launching for GNOME" url="http://www.gnome.org/"; -depends=('libxml2>=2.7.8' 'mutter>=3.2.1' 'gnome-desktop>=3.2.1' 'gjs>=1.30.0' \ - 'gnome-menus' 'librsvg' 'evolution-data-server' 'gconf' \ +depends=('libxml2>=2.7.8' 'mutter>=3.3.2-2' 'gnome-desktop>=3.3.2' 'gjs>=1.30.0' \ + 'gnome-menus' 'librsvg' 'evolution-data-server>=3.3.2' \ 'xulrunner' 'gst-plugins-base' 'pulseaudio>=1.1' \ 'gnome-themes-standard' 'ca-certificates' \ 'gnome-bluetooth' 'gtk+3>=3.0.8' 'telepathy-glib' 'nm-applet' \ diff --cc source/gnome/vinagre/FrugalBuild index d3bb016,a9faa91..b9c9ad5 --- a/source/gnome/vinagre/FrugalBuild +++ b/source/gnome/vinagre/FrugalBuild @@@ -2,8 -2,8 +2,8 @@@ # Maintainer: bouleetbil <[email protected]> pkgname=vinagre -pkgver=3.2.2 +pkgver=3.3.2 - pkgrel=1 + pkgrel=2 pkgdesc="VNC Client for the GNOME Desktop" depends=('gtk3-vnc' 'gnutls>=2.12.12' 'libgcrypt' 'libavahi-ui' 'atk' \ 'pango' 'libxau' 'libxdmcp' 'freetype2' 'libxdamage' \ diff --cc source/xlib/xine-lib/FrugalBuild index 8babc00,eea8c7b..c81bd35 --- a/source/xlib/xine-lib/FrugalBuild +++ b/source/xlib/xine-lib/FrugalBuild @@@ -16,15 -16,10 +16,10 @@@ depends=('libxml2>=2.7.8' 'imagemagick> 'mesa' 'libx11' 'libxxf86vm' 'ffmpeg>=0.8' 'x264>=20110729' 'libtool' \ 'libxvmc' 'libxinerama' 'libjpeg' 'libmpcdec' 'libtiff' 'libraw1394>=2.0.0-1') options=('scriptlet') -makedepends=('esd' 'sdl>=1.2.14-2' 'jack>=0.118.0') +makedepends=('esd>=0.2.41' 'sdl>=1.2.14-2' 'jack>=0.118.0') groups=('xlib') archs=('i686' 'x86_64' 'ppc') - source=("${source[@]}" \ - xine-lib-1.1.19-xvmc.patch \ - xine-lib-1.1.19-ffmpeg.patch) - sha1sums=('5afcc28c5cf2bdaab99d951960f6587797e1e5a0' \ - '920bf27e6e3523dfe4cc9c802ff713e9688a3f34' \ - 'de8d432d3472abd0409934a7c194140096310018') + sha1sums=('60ce1cea9bf7a6b7d8c60141593a8ed0c54f9445') build() { _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
