2 files changed, 74 insertions, 13 deletions

diff --git a/meta/conf/distro/include/preferred-xorg-versions.inc b/meta/conf/distro/include/preferred-xorg-versions.inc
index 8181bb2198..c62ef97a46 100644
--- a/meta/conf/distro/include/preferred-xorg-versions.inc
+++ b/meta/conf/distro/include/preferred-xorg-versions.inc
@@ -103,7 +103,7 @@ PREFERRED_VERSION_xproxymanagementprotocol = "1.0.2"
 PREFERRED_VERSION_xrandr = "1.2.2"
 PREFERRED_VERSION_xrdb = "1.0.3"
 PREFERRED_VERSION_xserver-kdrive = "1.3.0.0"
-PREFERRED_VERSION_xserver-xorg = "1.1.0"
+PREFERRED_VERSION_xserver-xorg = "1.3.0.0"
 PREFERRED_VERSION_xset = "1.0.2"
 PREFERRED_VERSION_xtrans = "1.0.3"
 PREFERRED_VERSION_xtrans-native = "1.0.3"
diff --git a/meta/conf/distro/include/sane-srcdates.inc b/meta/conf/distro/include/sane-srcdates.inc
index ffde56224c..e5db7a9ceb 100644
--- a/meta/conf/distro/include/sane-srcdates.inc
+++ b/meta/conf/distro/include/sane-srcdates.inc
@@ -13,42 +13,98 @@ SRCDATE_libxext-native ?= "20060814"
 SRCDATE_libxss ?= "20060814"
 SRCDATE_recordext ?= "20060814"
 SRCDATE_renderext ?= "20060814"
-SRCDATE_xcalibrate ?= "20060814"
-SRCDATE_xcalibrateext ?= "20060814"
+SRCDATE_calibrateproto ?= "20070802"
+SRCDATE_libxcalibrate ?= "20070802"
 SRCDATE_xxf86dgaext ?= "20060814"
-SRCDATE_xxf86vmext ?= "20060814" 
+SRCDATE_xxf86vmext ?= "20060814"
 
 # Matchbox / O-hand
 SRCDATE_contacts ?= "20060707"
 SRCDATE_dates ?= "20060707"
-SRCDATE_fstests ?= "20061111"
-SRCDATE_eds-dbus ?= "20060707"
+SRCDATE_fstests ?= "20061122"
+SRCDATE_eds-dbus ?= "20070704"
 SRCDATE_libmatchbox ?= "20060612"
 SRCDATE_libfakekey ?= "20051101"
 SRCDATE_matchbox-common ?= "20060612"
 SRCDATE_matchbox-config-gtk ?= "20060612"
 SRCDATE_matchbox-desktop ?= "20060612"
-SRCDATE_matchbox-keyboard ?= "20060612"
+SRCDATE_matchbox-keyboard ?= "20070816"
 SRCDATE_matchbox-panel ?= "20060612"
 SRCDATE_matchbox-panel-manager ?= "20060612"
 SRCDATE_matchbox-stroke ?= "20060612"
 SRCDATE_matchbox-themes-extra ?= "20060612"
 SRCDATE_matchbox-wm ?= "20060612"
-SRCDATE_psplash ?= "20061011"
+SRCDATE_libmatchbox ?= "20060612"
+SRCDATE_libfakekey ?= "20051101"
+SRCDATE_psplash ?= "20070330"
 SRCDATE_web ?= "20060613"
 SRCDATE_zaurusd ?= "20060628"
 
 # GPE
 SRCDATE_dasher-gpe  ?= "20060814"
 SRCDATE_rosetta ?= "20060804"
-SRCDATE_libmimedir ?= "20060804"
+SRCDATE_gpesyncd ?= "20070701"
 
 # GNOME
-SRCDATE_gconf-dbus ?= "20060719"
-SRCDATE_gnome-vfs-dbus ?= "20060119"
+SRCDATE_gconf-dbus ?= "20070512"
+SRCDATE_gnome-vfs ?= "20060119"
 SRCDATE_gtkhtml2 ?= "20060323"
 
-#Misc apps, sorted by alphabet
+# Enlightenment Foundation Libraries
+# Caution: This is not alphabetically, but (roughly) dependency-sorted.
+# Please leave it like that.
+EFL_SRCDATE = "20070819"
+SRCDATE_edb-native ?= "${EFL_SRCDATE}"
+SRCDATE_edb ?= "${EFL_SRCDATE}"
+SRCDATE_eet-native ?= "${EFL_SRCDATE}"
+SRCDATE_eet ?= "${EFL_SRCDATE}"
+SRCDATE_evas-native ?= "${EFL_SRCDATE}"
+SRCDATE_evas ?= "${EFL_SRCDATE}"
+SRCDATE_ecore-native ?= "${EFL_SRCDATE}"
+SRCDATE_ecore ?= "${EFL_SRCDATE}"
+SRCDATE_edbus ?= "${EFL_SRCDATE}"
+SRCDATE_embryo-native ?= "${EFL_SRCDATE}"
+SRCDATE_embryo ?= "${EFL_SRCDATE}"
+SRCDATE_edje-native ?= "${EFL_SRCDATE}"
+SRCDATE_edje ?= "${EFL_SRCDATE}"
+SRCDATE_emotion ?= "${EFL_SRCDATE}"
+SRCDATE_etk-native ?= "${EFL_SRCDATE}"
+SRCDATE_etk ?= "${EFL_SRCDATE}"
+SRCDATE_ewl ?= "${EFL_SRCDATE}"
+SRCDATE_epeg ?= "${EFL_SRCDATE}"
+SRCDATE_epsilon ?= "${EFL_SRCDATE}"
+SRCDATE_epdf ?= "${EFL_SRCDATE}"
+SRCDATE_esmart ?= "${EFL_SRCDATE}"
+SRCDATE_efreet ?= "${EFL_SRCDATE}"
+SRCDATE_exml ?= "${EFL_SRCDATE}"
+SRCDATE_enhance ?= "${EFL_SRCDATE}"
+SRCDATE_engrave ?= "${EFL_SRCDATE}"
+SRCDATE_evolve-native ?= "${EFL_SRCDATE}"
+SRCDATE_evolve ?= "${EFL_SRCDATE}"
+SRCDATE_gevas2 ?= "${EFL_SRCDATE}"
+
+# Enlightenment Bindings
+SRCDATE_eflpp ?= "${EFL_SRCDATE}"
+SRCDATE_python-evas ?= "${EFL_SRCDATE}"
+SRCDATE_python-ecore ?= "${EFL_SRCDATE}"
+SRCDATE_python-edje ?= "${EFL_SRCDATE}"
+SRCDATE_python-ewl ?= "${EFL_SRCDATE}"
+SRCDATE_python-etk ?= "${EFL_SRCDATE}"
+
+# Enlightenment Applications
+SRCDATE_edje-viewer ?= "${EFL_SRCDATE}"
+SRCDATE_edje-editor ?= "${EFL_SRCDATE}"
+SRCDATE_emphasis ?= "${EFL_SRCDATE}"
+SRCDATE_ephoto ?= "${EFL_SRCDATE}"
+SRCDATE_examine ?= "${EFL_SRCDATE}"
+SRCDATE_exhibit ?= "${EFL_SRCDATE}"
+SRCDATE_expedite ?= "${EFL_SRCDATE}"
+SRCDATE_elitaire ?= "${EFL_SRCDATE}"
+SRCDATE_entice ?= "${EFL_SRCDATE}"
+SRCDATE_e-utils ?= "${EFL_SRCDATE}"
+SRCDATE_enna ?= "${EFL_SRCDATE}"
+
+# Misc packages, sorted by alphabet
 SRCDATE_avetanabt ?= "20060814"
 SRCDATE_bl ?= "20060814"
 SRCDATE_dvbstream ?= "20060814"
@@ -66,8 +122,10 @@ SRCDATE_kbdd ?= "20061019"
 SRCDATE_led ?= "20060814"
 SRCDATE_linux-input ?= "20060814"
 SRCDATE_madwifi-modules ?= "20060814"
+SRCDATE_maemo-mapper-nohildon ?= "20061114"
 SRCDATE_mileage ?= "20060814"
 SRCDATE_minimo ?= "20050401"
+SRCDATE_mpd ?= "20070210"
 SRCDATE_mystun-server ?= "20060814"
 SRCDATE_olsrd ?= "20060814"
 SRCDATE_opencvs ?= "20060814"
@@ -75,7 +133,7 @@ SRCDATE_oprofile ?= "20061011"
 SRCDATE_portaudio ?= "20060814"
 SRCDATE_putty ?= "20060814"
 SRCDATE_python-cairo ?= "20060814"
-SRCDATE_qemu-native ?= "20060723"
+SRCDATE_qemu-native ?= "20070613"
 SRCDATE_roadster ?= "20060814"
 SRCDATE_sctzap ?= "20060814"
 SRCDATE_tslib ?= "20051101"
@@ -86,3 +144,6 @@ SRCDATE_xsvg ?= "20060814"
 SRCDATE_yamonenv ?= "20060814"
 SRCDATE_zroadmap ?= "20060814"
 
+# Freedesktop.org
+SRCDATE_poppler0.6 = "20070708"
+