Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gnometesting.git;a=commitdiff;h=a4e974cc88d9aa915dfbd30ccd7908d9ea715bae
commit a4e974cc88d9aa915dfbd30ccd7908d9ea715bae Merge: f3a37c5 3e5b348 Author: bouleetbil <bouleet...@frogdev.info> Date: Sun Feb 6 18:26:14 2011 +0000 Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current Conflicts: source/gnome/epiphany/FrugalBuild source/gnome/gnome-frugalware/FrugalBuild source/gnome/gnome-frugalware/gnome-frugalware.install diff --cc source/gnome/epiphany/FrugalBuild index 63d3247,5880ed1..5607d0a --- a/source/gnome/epiphany/FrugalBuild +++ b/source/gnome/epiphany/FrugalBuild @@@ -15,13 -16,13 +15,13 @@@ _F_gnome_scrollkeeper="y _F_gnome_desktop="y" _F_gnome_iconcache="y" Finclude gnome gnome-scriptlet -groups=('gnome-extra') +groups=('gnome') archs=('x86_64' 'i686' 'ppc') - Fconfopts="$Fconfopts --enable-seed --enable-introspection --disable-nss --disable-tests \ + Fconfopts="$Fconfopts --disable-seed --disable-introspection --enable-nss --disable-tests \ --enable-python --disable-gtk-doc --without-ca-file --with-distributor-name=Frugalware" source=($source homepage.diff) -sha1sums=('a4bde975f9b2b97d6aad14b4b8a715b40d19a155' \ - '159658b8098bbffcf72782fc46b2f2ab05cec264') +sha1sums=('e4c4acce953aae1cb9514e560a390f2370a0f9ff' \ + '482ab8be71909eba927a0f866989f916f74f0b4c') replaces=('galeon') # optimization OK _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git