Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gnometesting.git;a=commitdiff;h=1f68da4caa8c6aa0e0f4c8f732fbe43960e275aa
commit 1f68da4caa8c6aa0e0f4c8f732fbe43960e275aa Merge: b9813d8 558d2dc Author: bouleetbil <bouleet...@frogdev.info> Date: Tue Aug 23 16:54:04 2011 +0200 Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current Conflicts: source/gnome/epiphany/FrugalBuild diff --cc source/gnome/epiphany/FrugalBuild index e752fdd,8b5964b..a5ccf50 --- a/source/gnome/epiphany/FrugalBuild +++ b/source/gnome/epiphany/FrugalBuild @@@ -2,12 -2,12 +2,12 @@@ # Maintainer: bouleetbil <bouleet...@frogdev.info> pkgname=epiphany -pkgver=3.0.4 +pkgver=3.1.5 - pkgrel=1 + pkgrel=2 pkgdesc="GNOME webbrowser based on the WebKit rendering engine" url="http://www.gnome.org/projects/epiphany/"; -depends=('libstdc++' 'dbus-x11' 'atk' 'libxslt' 'gnome-desktop>=3.0.1-2' 'startup-notification' \ - 'webkit-gtk3>=1.4.0' 'docbook-xsl' 'libsoup-gnome' 'seed>=2.30.0' 'ca-certificates') +depends=('libstdc++' 'dbus-x11' 'atk' 'libxslt' 'gnome-desktop>=3.1.4' 'startup-notification' \ + 'webkit-gtk3>=1.5.1' 'docbook-xsl' 'libsoup-gnome' 'seed>=3.0.0' 'ca-certificates') makedepends=('gtk-doc>=1.9' 'perl-xml-parser' 'python>=2.7' 'gobject-introspection' \ 'iso-codes' 'gnome-doc-utils>=0.16.0' 'intltool') _F_gnome_glib="y" @@@ -20,8 -20,8 +20,8 @@@ archs=('x86_64' 'i686' 'ppc' Fconfopts="$Fconfopts --enable-seed --enable-introspection --disable-nss --disable-tests \ --enable-python --disable-gtk-doc --with-distributor-name=Frugalware" source=($source homepage.diff) -sha1sums=('ccc983abf7ee03df40f7a02002786ffe4a84c304' \ +sha1sums=('fa1cefbe470f64c5d9c4d04daea93585f11cda61' \ - '482ab8be71909eba927a0f866989f916f74f0b4c') + '6c1ddcaa4dbb7fb24feb9a585344614248b06b6d') replaces=('galeon') # optimization OK _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
