Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gnometesting.git;a=commitdiff;h=1da3ffd50ecb521a8716de734246808609c0ab26
commit 1da3ffd50ecb521a8716de734246808609c0ab26 Merge: 1245739 4f543c3 Author: bouleetbil <bouleet...@frogdev.info> Date: Fri Nov 12 15:58:13 2010 +0000 Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current Conflicts: source/devel/json-glib/FrugalBuild source/gnome-extra/gtk+2-engines-murrine/FrugalBuild source/gnome/gnome-keyring/FrugalBuild source/gnome/nautilus/FrugalBuild diff --cc source/devel/json-glib/FrugalBuild index 2bbb402,9b3f29c..be7b575 --- a/source/devel/json-glib/FrugalBuild +++ b/source/devel/json-glib/FrugalBuild @@@ -8,8 -8,8 +8,8 @@@ pkgdesc="JSON library built on GLib url="http://live.gnome.org/JsonGlib"; Finclude gnome depends=('glib2') -groups=('devel-extra') +groups=('devel') archs=('i686' 'x86_64' 'ppc') - sha1sums=('e8e29ae6dda57bebb4ca2e1cdee46f7cee1c0b6b') + sha1sums=('2295a704d4e45a4e5333ea9eeda9b9c413b118d1') # optimization OK diff --cc source/gnome-extra/gtk+2-engines-murrine/FrugalBuild index 2b354a5,678ecdd..ac19d5f --- a/source/gnome-extra/gtk+2-engines-murrine/FrugalBuild +++ b/source/gnome-extra/gtk+2-engines-murrine/FrugalBuild @@@ -10,9 -10,9 +10,9 @@@ dlurl="http://www.gnome-look.org/CONTEN pkgdesc="Murrine is a fast and modern looking GTK+2 engine." depends=('gtk+2>=2.20.0-2' 'gtk+2-engines' 'gnome-icon-theme') makedepends=('intltool') -groups=('gnome') +groups=('gnome-extra') archs=('i686' 'x86_64' 'ppc') - source=(ftp://frugalware.org/pub/other/people/devil505/snapshots/$pkgname/$pkgname-$pkgver.tar.bz2 \ + source=($source \ 'http://cimi.netsons.org/media/download_gallery/MurrineThemePack.tar.bz2' \ $dlurl/43590-MurrinaElegant.tar.gz \ $dlurl/45896-Murrina-GT4.tar.bz2 \ _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
