From 0808818963f040267321e32b58ba1684ca2ddec8 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sun, 17 May 2009 11:17:22 +0100 Subject: conf/distro: Update PREFERRED_VERSIONs Signed-off-by: Richard Purdie --- meta/conf/distro/include/poky-fixed-revisions.inc | 3 +-- meta/conf/distro/include/preferred-xorg-versions.inc | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) (limited to 'meta/conf') diff --git a/meta/conf/distro/include/poky-fixed-revisions.inc b/meta/conf/distro/include/poky-fixed-revisions.inc index d43a881c1..36120e2ca 100644 --- a/meta/conf/distro/include/poky-fixed-revisions.inc +++ b/meta/conf/distro/include/poky-fixed-revisions.inc @@ -209,12 +209,11 @@ PREFERRED_VERSION_dbus-glib ?= "0.78" PREFERRED_VERSION_dbus-glib-native ?= "0.78" PREFERRED_VERSION_gnome-vfs ?= "2.22.0" PREFERRED_VERSION_libgnomecanvas ?= "2.20.0" -PREFERRED_VERSION_gnome-keyring ?= "2.20" PREFERRED_VERSION_evince ?= "2.20.0" PREFERRED_VERSION_minimo ?= "0.02+cvs${SRCDATE_minimo}" PREFERRED_VERSION_oprofile ?= "0.9.4" PREFERRED_VERSION_elfutils ?= "0.89" -PREFERRED_VERSION_hal ?= "0.5.9.1" +PREFERRED_VERSION_hal ?= "0.5.11" PREFERRED_VERSION_hal-info ?= "20070831" diff --git a/meta/conf/distro/include/preferred-xorg-versions.inc b/meta/conf/distro/include/preferred-xorg-versions.inc index d076aca26..4e873e036 100644 --- a/meta/conf/distro/include/preferred-xorg-versions.inc +++ b/meta/conf/distro/include/preferred-xorg-versions.inc @@ -146,6 +146,6 @@ PREFERRED_VERSION_xf86-input-evdev ?= "2.2.1" PREFERRED_VERSION_xf86-input-mouse ?= "1.4.0" PREFERRED_VERSION_xf86-input-keyboard ?= "1.3.2" PREFERRED_VERSION_xf86-input-synaptics ?= "1.1.0" -PREFERRED_VERSION_xf86-video-intel ?= "2.4.97.0+git${SRCREV}" -PREFERRED_VERSION_xf86-video-intel-dri2 ?= "2.4.97.0+git${SRCREV}" +PREFERRED_VERSION_xf86-video-intel ?= "2.7.0" + -- cgit v1.2.3