From fdb00295bae640081bc06db9126a69b5f5c3859b Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Tue, 4 Mar 2008 16:56:51 +0000 Subject: 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 --- meta/conf/distro/poky-bleeding.conf | 3 --- meta/conf/distro/poky.conf | 4 ++-- 2 files changed, 2 insertions(+), 5 deletions(-) (limited to 'meta/conf') diff --git a/meta/conf/distro/poky-bleeding.conf b/meta/conf/distro/poky-bleeding.conf index 367c9f11c..f7865137c 100644 --- 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 15eb959ea..cba73a63b 100644 --- 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" -- cgit v1.2.3