poky: use dbus 1.1.20 by default

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3908 311d38ba-8fff-0310-9ca6-ca027cbcb966

diff --git a/meta/conf/distro/poky-bleeding.conf b/meta/conf/distro/poky-bleeding.conf
index 367c9f11c16f14a3edc355dfffca31980ed88635..f7865137c43c6dcf69b8ff8cfeca5fc4ca693755 100644 (file)
--- a/meta/conf/distro/poky-bleeding.conf
+++ b/meta/conf/distro/poky-bleeding.conf
@@ -1,4 +1 @@
-PREFERRED_VERSION_dbus ?= "1.1.4"
-PREFERRED_VERSION_dbus-native ?= "1.1.4"
-
 require conf/distro/poky.conf

diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf
index 15eb959ea2d4e13b06d927cad424b3a1e8a6eacf..cba73a63b3f17814647483aa1820fc22836a3939 100644 (file)
--- a/meta/conf/distro/poky.conf
+++ b/meta/conf/distro/poky.conf
@@ -206,8 +206,8 @@ PREFERRED_VERSION_cairo ?= "1.4.14"
 PREFERRED_VERSION_pango ?= "1.18.3"
 PREFERRED_VERSION_gtk+ ?= "2.12.7"
 
-PREFERRED_VERSION_dbus ?= "1.0.3"
-PREFERRED_VERSION_dbus-native ?= "1.0.3"
+PREFERRED_VERSION_dbus ?= "1.1.20"
+PREFERRED_VERSION_dbus-native ?= "1.1.20"
 PREFERRED_VERSION_dbus-glib ?= "0.74"
 PREFERRED_VERSION_dbus-glib-native ?= "0.74"
 PREFERRED_VERSION_gnome-vfs ?= "2.20.0"