1 files changed, 22 insertions, 25 deletions

diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf
index bd52f1eca0..8a2e986369 100644
--- a/meta/conf/distro/poky.conf
+++ b/meta/conf/distro/poky.conf
@@ -63,8 +63,6 @@ PREFERRED_PROVIDER_virtual/libx11 ?= "diet-x11"
 PREFERRED_PROVIDER_dbus-glib ?= "dbus-glib"
 PREFERRED_PROVIDER_dbus-glib-native ?= "dbus-glib-native"
 PREFERRED_PROVIDER_gconf ?= "gconf-dbus"
-PREFERRED_PROVIDER_gnome-vfs ?= "gnome-vfs"
-PREFERRED_PROVIDER_tslib ?= "tslib"
 PREFERRED_PROVIDER_matchbox-desktop ?= "matchbox-desktop-2"
 PREFERRED_PROVIDER_matchbox-panel ?= "matchbox-panel-2"
 
@@ -73,29 +71,29 @@ PREFERRED_PROVIDER_matchbox-panel ?= "matchbox-panel-2"
 # CVS Dates to use:
 #
 SRCDATE_gconf-dbus ?= "20061219"
-SRCDATE_contacts ?= "20060707"
+SRCDATE_contacts ?= "20070411"
 SRCDATE_dates ?= "20070414"
 SRCDATE_gtkhtml2 ?= "20060323"
-SRCDATE_web ?= "20060613"
+SRCDATE_web ?= "20070411"
 SRCDATE_eds-dbus ?= "20070330"
 SRCDATE_minimo ?= "20050401"
 SRCDATE_ipkg-utils-native ?= "20050930"
 SRCDATE_ipkg-link-1 ?= "20050930"
 SRCDATE_ipkg-utils ?= "20050930"
 SRCDATE_ipkg-link ?= "20050930"
-SRCDATE_matchbox-common ?= "20070414"
-SRCDATE_matchbox-config-gtk ?= "20070414"
+SRCDATE_matchbox-common ?= "20070417"
+SRCDATE_matchbox-config-gtk ?= "20070417"
 SRCDATE_matchbox-desktop ?= "20060612"
-SRCDATE_matchbox-desktop-2 ?= "20070413"
-SRCDATE_matchbox-keyboard ?= "20060612"
+SRCDATE_matchbox-desktop-2 ?= "20070417"
+SRCDATE_matchbox-keyboard ?= "20070417"
 SRCDATE_matchbox-panel ?= "20060727"
 SRCDATE_matchbox-panel-manager ?= "20060612"
-SRCDATE_matchbox-panel-2 ?= "20070415"
-SRCDATE_matchbox-stroke ?= "20060612"
-SRCDATE_matchbox-themes-extra ?= "20060612"
-SRCDATE_matchbox-wm ?= "20061223"
-SRCDATE_libmatchbox ?= "20060729"
-SRCDATE_settings-daemon ?= "20070104"
+SRCDATE_matchbox-panel-2 ?= "20070417"
+SRCDATE_matchbox-stroke ?= "20070417"
+SRCDATE_matchbox-themes-extra ?= "20070417"
+SRCDATE_matchbox-wm ?= "20070417"
+SRCDATE_libmatchbox ?= "20070417"
+SRCDATE_settings-daemon ?= "20070417"
 SRCDATE_screenshot ?= "20070125"
 SRCDATE_xcalibrateext ?= "20051101"
 SRCDATE_libfakekey ?= "20051101"
@@ -103,16 +101,16 @@ SRCDATE_xcalibrate ?= "20060312"
 SRCDATE_qemu ?= "20060723"
 SRCDATE_qemu-native ?= "20060723"
 SRCDATE_oprofile ?= "20070106"
-SRCDATE_oprofileui ?= "20070403"
-SRCDATE_zaurusd ?= "20070201"
-SRCDATE_owl-video-widget ?= "20070201"
-SRCDATE_psplash ?= "20070329"
+SRCDATE_oprofileui ?= "20070417"
+SRCDATE_zaurusd ?= "20070417"
+SRCDATE_owl-video-widget ?= "20070417"
+SRCDATE_psplash ?= "20070417"
 SRCDATE_maemo-mapper-nohildon ?= "20061114"
 SRCDATE_exmap-console = "20061220"
-SRCDATE_gtk-sato-engine = "20070414"
-SRCDATE_matchbox-theme-sato = "20070403"
-SRCDATE_tasks = "20070317"
-SRCDATE_sato-icon-theme = "20070413"
+SRCDATE_gtk-sato-engine = "20070417"
+SRCDATE_matchbox-theme-sato = "20070417"
+SRCDATE_tasks = "20070417"
+SRCDATE_sato-icon-theme = "20070417"
 
 #
 # Preferred Versions:
@@ -128,16 +126,15 @@ PREFERRED_VERSION_matchbox-keyboard ?= "0.0+svn${SRCDATE}"
 PREFERRED_VERSION_matchbox-panel ?= "0.9.2+svn${SRCDATE}"
 PREFERRED_VERSION_matchbox-stroke ?= "0.0+svn${SRCDATE}"
 PREFERRED_VERSION_matchbox-themes-extra ?= "0.3+svn${SRCDATE}"
-PREFERRED_VERSION_matchbox-wm ?= "1.1+svn${SRCDATE}"
+PREFERRED_VERSION_matchbox-wm ?= "1.2+svn${SRCDATE}"
 PREFERRED_VERSION_libmatchbox ?= "1.9"
 
 PREFERRED_VERSION_glib-2.0 ?= "2.10.3"
 PREFERRED_VERSION_glib-2.0-native ?= "2.10.3"
 PREFERRED_VERSION_atk ?= "1.10.3"
-PREFERRED_VERSION_cairo ?= "1.0.4"
+PREFERRED_VERSION_cairo ?= "1.2.4"
 PREFERRED_VERSION_pango ?= "1.10.2"
 PREFERRED_VERSION_gtk+ ?= "2.6.8"
-#PREFERRED_VERSION_gtk+ ?= "2.8.16"
 
 PREFERRED_VERSION_dbus ?= "1.0.1"
 PREFERRED_VERSION_dbus-native ?= "1.0.1"