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/networkmanager/networkmanager.inc | 2 +- recipes/networkmanager/networkmanager_0.6.4.bb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'recipes/networkmanager') diff --git a/recipes/networkmanager/networkmanager.inc b/recipes/networkmanager/networkmanager.inc index ead854ca58..c159883bfd 100644 --- a/recipes/networkmanager/networkmanager.inc +++ b/recipes/networkmanager/networkmanager.inc @@ -3,7 +3,7 @@ SECTION = "net/misc" LICENSE = "GPL" HOMEPAGE = "http://www.gnome.org" PRIORITY = "optional" -DEPENDS = "libnl dbus dbus-glib hal gconf-dbus wireless-tools ppp" +DEPENDS = "libnl dbus dbus-glib hal gconf wireless-tools ppp" RDEPENDS = "hal wpa-supplicant iproute2 dhcp-client dhcdbd" SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/0.6/NetworkManager-${PV}.tar.bz2 \ diff --git a/recipes/networkmanager/networkmanager_0.6.4.bb b/recipes/networkmanager/networkmanager_0.6.4.bb index 737d9544d0..f41449c610 100644 --- a/recipes/networkmanager/networkmanager_0.6.4.bb +++ b/recipes/networkmanager/networkmanager_0.6.4.bb @@ -3,10 +3,10 @@ SECTION = "network/misc" LICENSE = "GPL" HOMEPAGE = "http://www.gnome.org" PRIORITY = "optional" -DEPENDS = "libnl dbus dbus-glib libhal-nm libgpewidget gnome-keyring gconf-dbus wireless-tools libglade" +DEPENDS = "libnl dbus dbus-glib libhal-nm libgpewidget gnome-keyring gconf wireless-tools libglade" RDEPENDS = "wpa-supplicant iproute2 dhcdbd gnome-keyring hicolor-icon-theme" -PR = "r5" +PR = "r6" SRC_URI="http://www.handhelds.org/~mmp/files/NetworkManager-${PV}-gpe.tar.gz \ file://dbus-api-fix.patch;patch=1 \ -- cgit v1.2.3