From bd9190c53157c64620fb08f0349d8d7d6a64fb79 Mon Sep 17 00:00:00 2001 From: Stanislav Brabec Date: Wed, 21 Oct 2009 20:40:28 +0000 Subject: many recipes: Recipes must not depend on gconf-dbus directly, only dbus can be referred: * Only PREFERRED_PROVIDER_gconf in distro definition can refer to gconf-dbus. * Both gconf-dbus and gconf provide than same interface. * New gconf packages already provide defaults settings via dbus. * Increment PR to rebuild against correct package. --- recipes/gpephone/firewall_svn.bb | 4 ++-- recipes/gpephone/libsettings_0.3.bb | 3 ++- recipes/gpephone/libsettings_svn.bb | 3 ++- 3 files changed, 6 insertions(+), 4 deletions(-) (limited to 'recipes/gpephone') diff --git a/recipes/gpephone/firewall_svn.bb b/recipes/gpephone/firewall_svn.bb index b3d7aee848..6c3ed64b26 100644 --- a/recipes/gpephone/firewall_svn.bb +++ b/recipes/gpephone/firewall_svn.bb @@ -2,12 +2,12 @@ LICENSE = "LiPS" DESCRIPTION = "Cellphone firewall tool" SECTION = "gpe" PRIORITY = "optional" -PR = "r0" +PR = "r1" PV = "0.0+svnr-${SRCREV}" DEFAULT_PREFERENCE = "-1" -DEPENDS = "gtk+ libmsgenabler libabenabler libiac libgpewidget libgpephone gconf-dbus" +DEPENDS = "gtk+ libmsgenabler libabenabler libiac libgpewidget libgpephone gconf" inherit gpephone autotools pkgconfig diff --git a/recipes/gpephone/libsettings_0.3.bb b/recipes/gpephone/libsettings_0.3.bb index 22f8c4f3e0..3c9794edc2 100644 --- a/recipes/gpephone/libsettings_0.3.bb +++ b/recipes/gpephone/libsettings_0.3.bb @@ -2,7 +2,8 @@ DESCRIPTION = "G(PE)^2 settings API library" SECTION = "gpe/libs" PRIORITY = "required" LICENSE = "LiPS" -DEPENDS = "glib-2.0 gconf-dbus" +DEPENDS = "glib-2.0 gconf" +PR = "r1" inherit gpephone pkgconfig autotools diff --git a/recipes/gpephone/libsettings_svn.bb b/recipes/gpephone/libsettings_svn.bb index 74e1190c5a..770fe8cce6 100644 --- a/recipes/gpephone/libsettings_svn.bb +++ b/recipes/gpephone/libsettings_svn.bb @@ -2,8 +2,9 @@ DESCRIPTION = "G(PE)^2 settings API library" SECTION = "gpe/libs" PRIORITY = "required" LICENSE = "LiPS" -DEPENDS = "glib-2.0 gconf-dbus" +DEPENDS = "glib-2.0 gconf" PV = "0.0+svnr-${SRCREV}" +PR = "r1" DEFAULT_PREFERENCE = "-1" -- cgit v1.2.3