Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gnometesting.git;a=commitdiff;h=65b692248d5d4e4adb304dd18eed1023e44f263d
commit 65b692248d5d4e4adb304dd18eed1023e44f263d Merge: 85f7fb6 5378312 Author: Baste <[email protected]> Date: Wed Nov 21 14:22:02 2012 +0100 Merge ../current Conflicts: source/base/glib2/FrugalBuild source/gnome/at-spi2-atk/FrugalBuild source/gnome/at-spi2-core/FrugalBuild source/gnome/dconf/FrugalBuild source/gnome/evolution-data-server/FrugalBuild source/gnome/gcr/FrugalBuild source/gnome/gnome-desktop/FrugalBuild source/gnome/gnome-keyring/FrugalBuild source/gnome/gnome-online-accounts/FrugalBuild source/gnome/gnome-settings-daemon/FrugalBuild source/lib/glib-networking/FrugalBuild source/lib/libsoup/FrugalBuild source/xapps/gvfs/FrugalBuild source/xlib/gtk+3/FrugalBuild diff --cc source/gnome/dconf/FrugalBuild index ab3429b,db6c0d5..4c60919 --- a/source/gnome/dconf/FrugalBuild +++ b/source/gnome/dconf/FrugalBuild @@@ -15,8 -15,9 +15,9 @@@ _F_gnome_doc="y _F_gnome_ext=".tar.xz" _F_gnome_iconcache="y" _F_gnome_gio="y" + _F_gnome_devel="n" Finclude gnome gnome-scriptlet -sha1sums=('1983e832f03408ebb8544064604dd2d4379c47eb') +sha1sums=('8449a5c090dd7e845f513b2d7ad18ba5dcc3dda7') subpkgs=("${subpkgs[@]}" 'dconf-editor') subdescs=("${subdescs[@]}" 'Configuration editor for dconf') diff --cc source/gnome/evolution-data-server/FrugalBuild index 39bcf75,935ee40..174048b --- a/source/gnome/evolution-data-server/FrugalBuild +++ b/source/gnome/evolution-data-server/FrugalBuild @@@ -15,9 -15,9 +15,10 @@@ archs=('i686' 'x86_64' _F_gnome_git="n" _F_gnome_ext=".tar.xz" _F_gnome_glib="y" -_F_gnome_devel="n" +_F_gnome_devel="y" Finclude gnome -sha1sums=('fcb561e1efdbd30071f0ddad4668a77bbe1c3324') +sha1sums=('286b4018b0836c8cdc0441c5638e5fd93555a622') ++ if [ "$_F_gnome_git" != "n" ]; then unset sha1sums fi diff --cc source/gnome/gnome-settings-daemon/FrugalBuild index 883392e,c69c1c9..b52f35e --- a/source/gnome/gnome-settings-daemon/FrugalBuild +++ b/source/gnome/gnome-settings-daemon/FrugalBuild @@@ -16,10 -17,11 +16,11 @@@ archs=('i686' 'x86_64' _F_gnome_ext=".tar.xz" _F_gnome_glib="y" _F_gnome_iconcache="y" -_F_gnome_git="n" +_F_gnome_devel="y" _F_gnome_doc="n" + _F_gnome_devel="n" Finclude gnome gnome-scriptlet -sha1sums=('7c30fc397b7081c56e7116430ddc71c91dd688c5') +sha1sums=('d7c31ef6b71a133f3f7e1f1e0df9b211f284f8c0') if [ "$_F_gnome_git" != "n" ]; then unset sha1sums _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
