1 files changed, 19 insertions, 21 deletions

diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf
index 85a8c25ea7..02b76e4e98 100644
--- a/meta/conf/distro/poky.conf
+++ b/meta/conf/distro/poky.conf
@@ -68,10 +68,10 @@ PREFERRED_PROVIDER_matchbox-panel ?= "matchbox-panel-2"
 # CVS Dates to use:
 #
 SRCDATE_gconf-dbus ?= "20061219"
-SRCDATE_contacts ?= "20070411"
+SRCDATE_contacts ?= "20070529"
 SRCDATE_dates ?= "20070414"
 SRCDATE_gtkhtml2 ?= "20060323"
-SRCDATE_web ?= "20070411"
+SRCDATE_web ?= "20070529"
 SRCDATE_eds-dbus ?= "20070330"
 SRCDATE_minimo ?= "20070510"
 SRCDATE_ipkg-utils-native ?= "20050930"
@@ -82,16 +82,16 @@ SRCDATE_matchbox-common ?= "20070417"
 SRCDATE_matchbox-config-gtk ?= "20070417"
 SRCDATE_matchbox-desktop ?= "20060612"
 SRCDATE_matchbox-desktop-2 ?= "20070531"
-SRCDATE_matchbox-keyboard ?= "20070518"
+SRCDATE_matchbox-keyboard ?= "20070529"
 SRCDATE_matchbox-panel ?= "20060727"
 SRCDATE_matchbox-panel-manager ?= "20060612"
-SRCDATE_matchbox-panel-2 ?= "20070417"
+SRCDATE_matchbox-panel-2 ?= "20070529"
 SRCDATE_matchbox-stroke ?= "20070417"
 SRCDATE_matchbox-themes-extra ?= "20070417"
 SRCDATE_matchbox-wm ?= "20070417"
 SRCDATE_libmatchbox ?= "20070417"
 SRCDATE_settings-daemon ?= "20070417"
-SRCDATE_screenshot ?= "20070505"
+SRCDATE_screenshot ?= "20070529"
 SRCDATE_xcalibrateext ?= "20051101"
 SRCDATE_libfakekey ?= "20051101"
 SRCDATE_xcalibrate ?= "20060312"
@@ -99,25 +99,25 @@ SRCDATE_qemu ?= "20060723"
 SRCDATE_qemu-native ?= "20060723"
 SRCDATE_oprofile ?= "20070529"
 SRCDATE_oprofileui ?= "20070529"
-SRCDATE_zaurusd ?= "20070417"
-SRCDATE_owl-video-widget ?= "20070417"
-SRCDATE_psplash ?= "20070417"
+SRCDATE_zaurusd ?= "20070529"
+SRCDATE_owl-video-widget ?= "20070529"
+SRCDATE_psplash ?= "20070529"
 SRCDATE_maemo-mapper-nohildon ?= "20061114"
-SRCDATE_exmap-console = "20061220"
-SRCDATE_gtk-sato-engine = "20070417"
+SRCDATE_exmap-console = "20070529"
+SRCDATE_gtk-sato-engine = "20070529"
 SRCDATE_matchbox-theme-sato = "20070424"
-SRCDATE_tasks = "20070528"
-SRCDATE_sato-icon-theme = "20070417"
+SRCDATE_tasks = "20070529"
+SRCDATE_sato-icon-theme = "20070529"
 SRCDATE_evince = "20070505"
-SRCDATE_oh-puzzles = "20070514"
-SRCDATE_libowl = "20070513"
+SRCDATE_oh-puzzles = "20070529"
+SRCDATE_libowl = "20070529"
 SRCDATE_libxcalibrate = "20070513"
 SRCDATE_calibrateproto = "20070513"
 SRCDATE_hal-info = "20070513"
-SRCDATE_gtk-theme-torturer = "20070513"
-SRCDATE_libsyncml = "20070513"
-SRCDATE_matchbox-applet-light = "20070513"
-SRCDATE_fstests = "20070513"
+SRCDATE_gtk-theme-torturer = "20070529"
+SRCDATE_libsyncml = "20070529"
+SRCDATE_matchbox-applet-light = "20070529"
+SRCDATE_fstests = "20070529"
 
 #
 # Preferred Versions:
@@ -216,9 +216,7 @@ EXCLUDE_FROM_WORLD_pn-libopensync-plugin-file-sync = "1"
 EXCLUDE_FROM_WORLD_pn-libopensync-plugin-syncml-plugin = "1"
 EXCLUDE_FROM_WORLD_pn-libopensync-plugin-syncml-client-plugin = "1"
 EXCLUDE_FROM_WORLD_pn-msynctool = "1"
-# Needs python-native
-EXCLUDE_FROM_WORLD_pn-telepathy-gabble = "1"
-EXCLUDE_FROM_WORLD_pn-telepathy-glib = "1"
+# Needs glib 2.12
 EXCLUDE_FROM_WORLD_pn-empathy = "1"
 # Needs python
 EXCLUDE_FROM_WORLD_pn-ipkg-utils = "1"