Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gnometesting.git;a=commitdiff;h=8b7cca34e160ba5c7c541d6221aec91a17041b4c
commit 8b7cca34e160ba5c7c541d6221aec91a17041b4c Merge: e51f07e a95f8f6 Author: bouleetbil <[email protected]> Date: Thu Nov 17 10:30:32 2011 +0100 Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current Conflicts: source/gnome/gnome-shell/FrugalBuild diff --cc source/gnome/gnome-shell/FrugalBuild index d8bb420,44c47db..52cd50b --- a/source/gnome/gnome-shell/FrugalBuild +++ b/source/gnome/gnome-shell/FrugalBuild @@@ -14,10 -14,12 +14,10 @@@ depends=('libxml2>=2.7.8' 'mutter>=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' \ - 'telepathy-logger>=0.2.8' 'folks>=0.6.4.1' 'json-glib>=0.13.90') - - 'telepathy-logger>=0.2.8' 'folks>=0.6.4.1' 'json-glib>=0.13.90' 'caribou' \ - 'pyatspi' 'gobject-introspection') ++ 'telepathy-logger>=0.2.8' 'folks>=0.6.4.1' 'json-glib>=0.13.90' \ ++ 'gobject-introspection') makedepends=('intltool' 'gnome-doc-utils' 'gnome-common' \ - 'gobject-introspection' 'krb5' 'caribou' 'pyatspi') - 'krb5') -#rodepends should be removed after 1.6 (just for help migration to 3.2) -rodepends=('gnome-contacts' 'gnome-documents' 'drwright') ++ 'krb5' 'caribou' 'pyatspi') replaces=('byzanz') if Fuse $USE_FRUGALTHEME; then rodepends=("${rodepends[@]}" "gnome-shell-frugalware-theme") @@@ -26,7 -28,7 +26,7 @@@ els provides=("${provides[@]}" "gnome-shell-frugalware-theme") removes=("${removes[@]}" "/usr/share/gnome-shell/theme") fi --#remove gnome-contacts gnome-documents depend after 1.6 ++ #HERE ADDED gnome-shell-extensions/themes ... incompatible replaces=("${replaces[@]}" "gnome-shell-extension-systray" "gnome-shell-extension-frugalware-logo" \ "gnome-shell-theme-selector" "gnome-shell-extension-autohidetopbar" "gnome-shell-extension-screen-off"\ _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
