Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gnometesting.git;a=commitdiff;h=5a122badfa457896d6f25d0f32c0dc2c3d877fb9
commit 5a122badfa457896d6f25d0f32c0dc2c3d877fb9 Merge: 8a06040 b97da14 Author: Baste <[email protected]> Date: Wed Sep 5 09:06:56 2012 +0200 Merge ../current Conflicts: source/gnome/cheese/FrugalBuild source/gnome/gnome-control-center/FrugalBuild source/gnome/gnome-settings-daemon/FrugalBuild source/gnome/gnome-shell/FrugalBuild source/gnome/nm-applet/FrugalBuild source/network/networkmanager/FrugalBuild diff --cc source/gnome/cheese/FrugalBuild index 4615843,a39616e..29b8e6f --- a/source/gnome/cheese/FrugalBuild +++ b/source/gnome/cheese/FrugalBuild @@@ -8,10 -8,10 +8,10 @@@ pkgrel= pkgdesc="Cheese is a Photobooth-inspired GNOME application for taking pictures and videos from a webcam." url="http://www.gnome.org/projects/cheese"; depends=('librsvg>=2.26.0-2' 'gst-plugins-good>=0.10.16-3' 'gst-plugins-base>=0.10.36' 'gst-plugins-base-pango' \ - 'xf86vidmodeproto' 'evolution-data-server>=3.1.92' 'dbus' 'gnome-video-effects' \ - 'gst-plugins-good-video4linux2' 'db>=4.7.25-2' 'gnome-desktop>=3.2.1' \ + 'xf86vidmodeproto' 'evolution-data-server>=3.5.3.1' 'dbus' 'gnome-video-effects' \ + 'gst-plugins-good-video4linux2' 'db>=4.7.25-2' 'gnome-desktop>=3.5.3' \ 'gst-plugins-bad-mpeg2enc' 'gst-plugins-base-ogg' 'gst-plugins-base-theora' 'gst-plugins-base-vorbis' 'gst-plugins-good-gconf' \ - 'libgudev' 'libcanberra-gtk' 'clutter-gst' 'libgee' 'clutter-gtk>=1.0.2-3' 'mx' 'gst-plugins-bad-vp8enc') + 'systemd>=188' 'libcanberra-gtk' 'clutter-gst' 'libgee' 'clutter-gtk>=1.0.2-3' 'mx' 'gst-plugins-bad-vp8enc') makedepends=('intltool' 'gnome-doc-utils' 'samba' 'fuse' 'libsoup' 'gconf>=2.28.0' 'krb5' 'gobject-introspection' 'itstool' 'vala') rodepends=('cheese-devel') groups=('gnome') diff --cc source/gnome/gnome-control-center/FrugalBuild index d571aff,73bab3e..771ba5d --- a/source/gnome/gnome-control-center/FrugalBuild +++ b/source/gnome/gnome-control-center/FrugalBuild @@@ -5,11 -5,11 +5,12 @@@ USE_CHEESE=${USE_CHEESE:-"y"} pkgname=gnome-control-center -pkgver=3.4.2 -pkgrel=3 ++<<<<<<< HEAD +pkgver=3.5.4 +pkgrel=2 pkgdesc="GNOME Control Center" - depends=('gnome-desktop>=3.5.3' 'gnome-menus>=3.5.3' 'gnome-online-accounts>=3.5.3' 'libgtop' 'gnome-settings-daemon>=3.5.4' 'systemd' \ -depends=('gnome-desktop' 'gnome-menus' 'gnome-online-accounts' 'libgtop' 'gnome-settings-daemon' 'systemd>=188' \ - 'nm-applet' 'libsocialweb' 'mesademos') ++depends=('gnome-desktop>=3.5.3' 'gnome-menus>=3.5.3' 'gnome-online-accounts>=3.5.3' 'libgtop' 'gnome-settings-daemon>=3.5.4' 'systemd>=188' \ + 'nm-applet>=0.9.5.95' 'libsocialweb' 'mesademos' 'libpwquality') makedepends=('intltool' 'gnome-doc-utils' 'cups' 'krb5' 'icu4c>=4.8') rodepends=('gst-plugins-base-alsa>=0.10.19-2' 'sound-theme-freedesktop') groups=('gnome' 'gnome-minimal') diff --cc source/gnome/gnome-settings-daemon/FrugalBuild index aa76745,6e3280e..93af3fb --- a/source/gnome/gnome-settings-daemon/FrugalBuild +++ b/source/gnome/gnome-settings-daemon/FrugalBuild @@@ -3,13 -3,14 +3,15 @@@ # Contributor: bouleetbil <[email protected]> pkgname=gnome-settings-daemon -pkgver=3.4.2 -pkgrel=3 ++<<<<<<< HEAD +pkgver=3.5.4 +pkgrel=2 pkgdesc="Utility library for accessing gnome-settings-daemon over DBUS" -depends=('libxml2>=2.7.8' 'libgnomekbd>=3.4.0.1' 'gst-plugins-base>=0.10.22-2' 'libxxf86misc' \ - 'gnome-desktop>=3.2.1' 'alsa-lib' 'pulseaudio>=2.1' 'gsettings-desktop-schemas' 'libxtst' 'libnotify' \ - 'gnome-icon-theme-symbolic' 'gnome-icon-theme' 'gnome-themes-standard' 'libcups' 'hwdata' 'colord' \ - 'upower' 'nss' 'gconf' 'libcanberra-gtk' 'libcanberra-pulseaudio' 'libwacom' 'xf86-input-wacom' \ - 'systemd>=188') +depends=('libxml2>=2.7.8' 'libgnomekbd>=3.5.2' 'gst-plugins-base>=0.10.22-2' 'libxxf86misc' \ - 'gnome-desktop>=3.5.4' 'alsa-lib' 'pulseaudio>=1.1' 'gsettings-desktop-schemas>=3.5.3' 'libxtst' 'libnotify' \ ++ 'gnome-desktop>=3.5.4' 'alsa-lib' 'pulseaudio>=2.1' 'gsettings-desktop-schemas>=3.5.3' 'libxtst' 'libnotify' \ + 'gnome-icon-theme-symbolic>=3.5.4' 'gnome-icon-theme' 'gnome-themes-standard>=3.5.4' 'libcups' 'hwdata' 'colord' \ - 'upower' 'nss' 'libcanberra-gtk' 'libcanberra-pulseaudio' 'libwacom' 'xf86-input-wacom') ++ 'upower' 'nss' 'libcanberra-gtk' 'libcanberra-pulseaudio' 'libwacom' 'xf86-input-wacom' \ ++ 'systemd>=188') makedepends=('intltool' 'gtk-doc>=1.11' 'gnome-doc-utils>=0.14.0' 'cups' 'krb5') rodepends=('xkbcomp') groups=('gnome' 'gnome-minimal') diff --cc source/gnome/gnome-shell/FrugalBuild index 1a7227b,79dc83a..a7572b1 --- a/source/gnome/gnome-shell/FrugalBuild +++ b/source/gnome/gnome-shell/FrugalBuild @@@ -6,17 -6,17 +6,18 @@@ USE_FRUGALTHEME=${USE_FRUGALTHEME:-"n" USE_REPLACEEXTENSIONS=${USE_REPLACEEXTENSIONS:-"n"} pkgname=gnome-shell -pkgver=3.4.2 ++<<<<<<< HEAD +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' \ - 'gst-plugins-base' 'pulseaudio>=1.1' \ + 'gst-plugins-base' 'pulseaudio>=2.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') + 'gobject-introspection' 'caribou' 'systemd>=188') makedepends=('intltool' 'gnome-doc-utils' 'gnome-common' \ 'krb5' 'pyatspi') replaces=('byzanz') diff --cc source/gnome/nm-applet/FrugalBuild index ddf150f,1fa6e92..289ff4c --- a/source/gnome/nm-applet/FrugalBuild +++ b/source/gnome/nm-applet/FrugalBuild @@@ -3,11 -3,11 +3,11 @@@ pkgname=nm-applet _F_gnome_name=network-manager-applet -pkgver=0.9.4.1 -pkgrel=3 +pkgver=0.9.5.95 +pkgrel=1 pkgdesc="Network Management applet" -depends=('gconf' 'gtk+3' 'gnome-keyring>=3.3.0' \ +depends=('gtk+3' 'gnome-keyring>=3.3.0' \ - 'networkmanager>=0.9.3.997' 'polkit-gnome' \ + 'networkmanager>=0.9.4.0-8' 'polkit-gnome' \ 'mobile-broadband-provider-info' \ 'libnotify>0.7' 'gnome-bluetooth>=3.3.2' 'iso-codes') makedepends=('perl-xml-parser' 'intltool') diff --cc source/network/networkmanager/FrugalBuild index b48f4dd,e32b9b4..4868ff6 --- a/source/network/networkmanager/FrugalBuild +++ b/source/network/networkmanager/FrugalBuild @@@ -4,12 -4,12 +4,12 @@@ pkgname=networkmanager _F_gnome_name=NetworkManager _F_gnome_ext=.tar.xz -pkgver=0.9.4.0 -pkgrel=8 +pkgver=0.9.5.95 +pkgrel=1 pkgdesc="Network Management daemon" depends=('wireless_tools' 'iproute2' 'dhcpcd>=5.1.3' 'nss' 'libgcrypt' \ - 'libnl>=3.2.9' 'ppp' 'wpa_supplicant' 'iptables' 'polkit' 'libgudev' 'ca-certificates' \ - 'modemmanager' 'libarchive>=3.0.3') + 'libnl>=3.2.9' 'ppp' 'wpa_supplicant' 'iptables' 'polkit' 'ca-certificates' \ + 'modemmanager>=0.5.2.0-2' 'libarchive>=3.0.3' 'systemd>=188') makedepends=('perl-xml-parser' 'intltool' 'gobject-introspection') groups=('network') archs=('i686' 'x86_64') _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
