Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gnometesting.git;a=commitdiff;h=968110c3db459e62238352af71e61e928da3fec9
commit 968110c3db459e62238352af71e61e928da3fec9 Merge: b1a4181 71bb7b2 Author: bouleetbil <bouleet...@frogdev.info> Date: Tue Oct 11 09:17:34 2011 +0200 Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current diff --cc source/gnome-extra/monodevelop-database/FrugalBuild index 33a76a4,821838e..5254ea0 --- a/source/gnome-extra/monodevelop-database/FrugalBuild +++ b/source/gnome-extra/monodevelop-database/FrugalBuild @@@ -6,12 -6,12 +6,12 @@@ pkgver=2. pkgrel=1 pkgdesc="Database Extension for MonoDevelop" url="http://www.mono-project.com/"; -depends=('monodevelop>=2.6' 'sqlite3' 'mysql-connector-net') +depends=('monodevelop>=2.8' 'sqlite3' 'mysql-connector-net') makedepends=('intltool' 'perl-xml-parser') groups=('gnome-extra') - archs=('i686' 'x86_64' 'ppc') + archs=('i686' 'x86_64') up2date="Flasttar http://download.mono-project.com/sources/$pkgname/"; -source=(http://download.mono-project.com/sources/$pkgname/$pkgname-$pkgver.tar.gz) +source=(http://download.mono-project.com/sources/$pkgname/$pkgname-$pkgver.tar.bz2) options=('scriptlet') _F_mono_aot=0 Finclude mono diff --cc source/gnome-extra/monodevelop-java/FrugalBuild index e0c7f63,99c409a..f8338bc --- a/source/gnome-extra/monodevelop-java/FrugalBuild +++ b/source/gnome-extra/monodevelop-java/FrugalBuild @@@ -6,12 -6,12 +6,12 @@@ pkgver=2. pkgrel=1 pkgdesc="Java Extension for MonoDevelop" url="http://www.mono-project.com/"; -depends=('monodevelop>=2.6') +depends=('monodevelop>=2.8') makedepends=('intltool' 'perl-xml-parser') groups=('gnome-extra') - archs=('i686' 'x86_64' 'ppc') + archs=('i686' 'x86_64') up2date="Flasttar http://download.mono-project.com/sources/$pkgname/"; -source=(http://download.mono-project.com/sources/$pkgname/$pkgname-$pkgver.tar.gz) +source=(http://download.mono-project.com/sources/$pkgname/$pkgname-$pkgver.tar.bz2) options=('scriptlet') _F_mono_aot=0 Finclude mono diff --cc source/gnome-extra/monodevelop-python/FrugalBuild index 2f477c1,2aad1b8..b82aaec --- a/source/gnome-extra/monodevelop-python/FrugalBuild +++ b/source/gnome-extra/monodevelop-python/FrugalBuild @@@ -6,12 -6,12 +6,12 @@@ pkgver=2. pkgrel=1 pkgdesc="Python Extension for MonoDevelop" url="http://www.mono-project.com/"; -depends=('monodevelop>=2.6' 'python>=2.7') +depends=('monodevelop>=2.8' 'python>=2.7') makedepends=('intltool' 'perl-xml-parser') groups=('gnome-extra') - archs=('i686' 'x86_64' 'ppc') + archs=('i686' 'x86_64') up2date="Flasttar http://download.mono-project.com/sources/$pkgname/"; -source=(http://download.mono-project.com/sources/$pkgname/$pkgname-$pkgver.tar.gz) +source=(http://download.mono-project.com/sources/$pkgname/$pkgname-$pkgver.tar.bz2) options=('scriptlet') _F_mono_aot=0 Finclude mono diff --cc source/gnome-extra/monodevelop-vala/FrugalBuild index 237400c,180b41e..7a866a3 --- a/source/gnome-extra/monodevelop-vala/FrugalBuild +++ b/source/gnome-extra/monodevelop-vala/FrugalBuild @@@ -6,12 -6,12 +6,12 @@@ pkgver=2. pkgrel=1 pkgdesc="Vala Extension for MonoDevelop" url="http://www.mono-project.com/"; -depends=('monodevelop>=2.6' 'vala>=0.12') +depends=('monodevelop>=2.8' 'vala>=0.14') makedepends=('intltool' 'perl-xml-parser') groups=('gnome-extra') - archs=('i686' 'x86_64' 'ppc') + archs=('i686' 'x86_64') up2date="Flasttar http://download.mono-project.com/sources/$pkgname/"; -source=(http://download.mono-project.com/sources/$pkgname/$pkgname-$pkgver.tar.gz) +source=(http://download.mono-project.com/sources/$pkgname/$pkgname-$pkgver.tar.bz2 MonoDevelop.ValaBinding.dll.config) options=('scriptlet') _F_mono_aot=0 Finclude mono diff --cc source/gnome-extra/monodevelop/FrugalBuild index a1fdb6d,ea170f0..b0d018c --- a/source/gnome-extra/monodevelop/FrugalBuild +++ b/source/gnome-extra/monodevelop/FrugalBuild @@@ -10,9 -10,9 +10,9 @@@ depends=('shared-mime-info' 'gtk-sharp 'mono-addins>=0.6' 'gnome-sharp' 'gtksourceview-sharp') makedepends=('intltool' 'perl-xml-parser') groups=('gnome-extra') - archs=('i686' 'x86_64' 'ppc') + archs=('i686' 'x86_64') up2date="Flasttar http://download.mono-project.com/sources/$pkgname/"; -source=(http://download.mono-project.com/sources/$pkgname/$pkgname-$pkgver.tar.gz) +source=(http://download.mono-project.com/sources/$pkgname/$pkgname-$pkgver.tar.bz2) options=('scriptlet') _F_gnome_desktop=y diff --cc source/gnome/gdm/FrugalBuild index 29e3c1c,5bcbde0..29a92b4 --- a/source/gnome/gdm/FrugalBuild +++ b/source/gnome/gdm/FrugalBuild @@@ -13,13 -9,13 +13,13 @@@ url="http://www.gnome.org/ backup=(etc/gdm/custom.conf etc/pam.d/gdm etc/pam.d/gdm-autologin \ etc/pam.d/gdm-welcome) depends=('libxml2>=2.7.8' 'zenity>=3.0.0' 'libxi' 'fontconfig' 'libxrandr>=1.2.2' \ - 'librsvg>=2.26.0-2' 'gnome-keyring>=3.0.3' 'consolekit-x11>=0.4.5' 'libcanberra-gtk' \ - 'libxinerama' 'libxcursor' 'libxevie' 'xorg-server>=1.10.2' \ - 'pam' 'accountsservice' 'upower' 'nss' 'hwdata' 'dbus-x11') -rodepends=('xsm' 'sessreg' 'xmessage' 'gnome-session') -makedepends=('intltool' 'gnome-doc-utils' 'gobject-introspection') + 'librsvg>=2.26.0-2' 'gnome-keyring>=3.0.3' 'consolekit-x11>=0.4.5' 'libcanberra-gtk' \ + 'libxinerama' 'libxcursor' 'libxevie' 'xorg-server>=1.10.2' \ + 'pam' 'accountsservice' 'upower' 'nss' 'hwdata' 'dbus-x11' \ + 'xsm' 'sessreg' 'xmessage' 'gnome-session' 'gnome-shell' 'gnome-power-manager') +makedepends=('intltool' 'gnome-doc-utils' 'gobject-introspection' 'dconf' 'gnome-settings-daemon') groups=('gnome') - archs=('i686' 'x86_64' 'ppc') + archs=('i686' 'x86_64') _F_gnome_git="n" Finclude gnome source=(${source[@]} \ diff --cc source/gnome/gnome-shell/FrugalBuild index 83783d0,ad27d34..7848bbe --- a/source/gnome/gnome-shell/FrugalBuild +++ b/source/gnome/gnome-shell/FrugalBuild @@@ -39,13 -37,9 +39,13 @@@ replaces=("${replaces[@]}" "gnome-shell provides=("${provides[@]}" "gnome-shell-extension-systray" "gnome-shell-extension-frugalware-logo" \ "gnome-shell-theme-selector" "gnome-shell-extension-autohidetopbar") +if Fuse $USE_REPLACEEXTENSIONS; then + replaces=("${replaces[@]}" "gnome-shell-extensions" "gnome-shell-extensions-apps-menus" \ + "gnome-shell-extensions-dock" "gnome-shell-extensions-theme") +fi groups=('gnome') - archs=('i686' 'x86_64' 'ppc') + archs=('i686' 'x86_64') _F_gnome_schemas=('/etc/gconf/schemas/gnome-shell.schemas') _F_gnome_desktop="y" _F_gnome_glib="y" _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
