Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gnometesting.git;a=commitdiff;h=1791a0548f5205f92dfa32bb4e98031dda56dea8
commit 1791a0548f5205f92dfa32bb4e98031dda56dea8 Merge: 161582a 186d8ef Author: bouleetbil <[email protected]> Date: Wed Oct 12 17:01:14 2011 +0200 Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current Conflicts: source/gnome-extra/gnome-shell-extensions/FrugalBuild diff --cc source/gnome-extra/gnome-shell-extensions/FrugalBuild index c78c2d4,c92c0c1..f8f2db4 --- a/source/gnome-extra/gnome-shell-extensions/FrugalBuild +++ b/source/gnome-extra/gnome-shell-extensions/FrugalBuild @@@ -10,12 -10,12 +10,15 @@@ makedepends=('intltool' 'gnome-doc-util 'gobject-introspection' 'krb5') groups=('gnome-extra') archs=('i686' 'x86_64') - _F_gnome_git="y" + _F_gnome_git="n" _F_gnome_glib="y" Finclude gnome gnome-scriptlet gnome-shell-extensions + source=($source dock.patch) +sha1sums=('899f23d0aa0ccd65c8c569e4e9d63ffd54303bb9' \ + 'e56508e80791a762c2b82a5bf20d8347a1ed4b50') + source=($source dock.diff) + sha1sums=('899f23d0aa0ccd65c8c569e4e9d63ffd54303bb9' \ + '8329fe51a8b340038e5a6634b0a9f444e7f10ca1') if [ "$_F_gnome_git" != "n" ]; then unset sha1sums fi _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
