Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gnometesting.git;a=commitdiff;h=3a26b56bfdec91e1d86dc74412a8cd27494fb842
commit 3a26b56bfdec91e1d86dc74412a8cd27494fb842 Merge: 1af795b c544543 Author: bouleetbil <bouleet...@frogdev.info> Date: Tue Nov 15 00:13:49 2011 +0100 Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current Conflicts: source/gnome/dconf/FrugalBuild diff --cc source/gnome/dconf/FrugalBuild index 27d6866,48fc135..8b73630 --- a/source/gnome/dconf/FrugalBuild +++ b/source/gnome/dconf/FrugalBuild @@@ -2,26 -2,25 +2,26 @@@ # Maintainer: bouleetbil <bouleet...@frogdev.info> pkgname=dconf -pkgver=0.10.0 -pkgrel=2 +pkgver=0.11.0 - pkgrel=4 ++pkgrel=5 pkgdesc="A configuration system" depends=('dbus-glib' 'libxml2>=2.7.8') makedepends=('vala' 'gobject-introspection' 'libgee') -#rodepends can be removed after 1.5 -rodepends=('dconf-editor') -groups=('gnome') +groups=('gnome' 'gnome-minimal') archs=('i686' 'x86_64' 'ppc') _F_gnome_glib="y" +_F_gnome_doc="y" Finclude gnome gnome-scriptlet - sha1sums=('d1d81af4901fe20d9e4c7840e4b562ef4a09dabb') -sha1sums=('d5ab13cc42b8c94241a59adc0e7724742caef634') ++sha1sums=('d1d81af4901fe20d9e4c7840e4b562ef4a09dabb -subpkgs=('dconf-editor') -subdescs=('Configuration editor for dconf') -subdepends=('gtk+3 libgee') -subrodepends=('dconf') -subgroups=('gnome') -subarchs=('i686 x86_64 ppc') +subpkgs=("${subpkgs[@]}" 'dconf-editor') +subdescs=("${subdescs[@]}" 'Configuration editor for dconf') +subdepends=("${subdepends[@]}" 'gtk+3 libgee') +subrodepends=("${subrodepends[@]}" 'dconf') +subgroups=("${subgroups[@]}" 'gnome') +subarchs=("${subarchs[@]}" 'i686 x86_64 ppc') +subreplaces=("${subreplaces[@]}" '') +subprovides=("${subprovides[@]}" '') build() { Fbuild _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git