merge of '0d3b0d788fccfc1c07e0da07e8f8596c062e2ef2'

     and '8a4df13bdb5d6b154edb85a4b71e38ac457670a0'

4 files changed, 29 insertions, 21 deletions

diff --git a/conf/distro/include/angstrom-2008-preferred-versions.inc b/conf/distro/include/angstrom-2008-preferred-versions.inc
index e52a8ddb68..ebdca4a416 100644
--- a/conf/distro/include/angstrom-2008-preferred-versions.inc
+++ b/conf/distro/include/angstrom-2008-preferred-versions.inc
@@ -13,10 +13,11 @@ PREFERRED_VERSION_libtool-native = "2.2.4"
 PREFERRED_VERSION_libtool-cross	= "2.2.4"
 PREFERRED_VERSION_libtool-sdk	= "2.2.4"
 PREFERRED_VERSION_pango 	= "1.18.3"
-PREFERRED_VERSION_pixman	= "0.10.0"
+PREFERRED_VERSION_pixman	= "0.11.8"
 PREFERRED_VERSION_pkgconfig	= "0.23"
 PREFERRED_VERSION_pkgconfig-native = "0.23"
 PREFERRED_VERSION_pulseaudio 	= "0.9.10"
 PREFERRED_VERSION_tiff 		= "3.8.2+4.0.0beta2"
-PREFERRED_VERSION_udev 		= "118"
+PREFERRED_VERSION_udev 		= "124"
 PREFERRED_VERSION_xserver-kdrive = "1.4.0.90"
+PREFERRED_VERSION_xserver-xorg  = "1.4.2"
diff --git a/conf/distro/include/preferred-om-2008-versions.inc b/conf/distro/include/preferred-om-2008-versions.inc
index 13040fd45d..3f2c521224 100644
--- a/conf/distro/include/preferred-om-2008-versions.inc
+++ b/conf/distro/include/preferred-om-2008-versions.inc
@@ -91,14 +91,14 @@ PREFERRED_VERSION_bison-native ?= "2.0"
 PREFERRED_VERSION_bitbake ?= "1.8.6"
 PREFERRED_VERSION_bitchx ?= "1.1"
 PREFERRED_VERSION_bluesnarfer ?= "0.1"
-PREFERRED_VERSION_bluez-cups-backend ?= "3.23"
+PREFERRED_VERSION_bluez-cups-backend ?= "3.33"
 PREFERRED_VERSION_bluez-dtl1-workaround ?= "1.0"
 PREFERRED_VERSION_bluez-gnome ?= "0.14"
-PREFERRED_VERSION_bluez-gstreamer-plugin ?= "3.23"
-PREFERRED_VERSION_bluez-hcidump ?= "1.38"
-PREFERRED_VERSION_bluez-libs ?= "3.23"
-PREFERRED_VERSION_bluez-utils ?= "3.23"
-PREFERRED_VERSION_bluez-utils-alsa ?= "3.23"
+PREFERRED_VERSION_bluez-gstreamer-plugin ?= "3.33"
+PREFERRED_VERSION_bluez-hcidump ?= "1.42"
+PREFERRED_VERSION_bluez-libs ?= "3.33"
+PREFERRED_VERSION_bluez-utils ?= "3.33"
+PREFERRED_VERSION_bluez-utils-alsa ?= "3.33"
 PREFERRED_VERSION_bmon ?= "2.1.0"
 PREFERRED_VERSION_boa ?= "0.94.13"
 PREFERRED_VERSION_bochs ?= "2.1"
@@ -369,7 +369,7 @@ PREFERRED_VERSION_file ?= "4.21"
 PREFERRED_VERSION_file-native ?= "4.21"
 PREFERRED_VERSION_findutils ?= "4.2.29"
 PREFERRED_VERSION_findutils-native ?= "4.2.29"
-PREFERRED_VERSION_firefox ?= "1.0.7"
+PREFERRED_VERSION_firefox ?= "3.0.1"
 PREFERRED_VERSION_fis ?= "1.0"
 PREFERRED_VERSION_fish ?= "1.1.0"
 PREFERRED_VERSION_fixesproto ?= "4.0"
@@ -1009,7 +1009,7 @@ PREFERRED_VERSION_libsdl-native ?= "1.2.11"
 PREFERRED_VERSION_libsdl-net ?= "1.2.7"
 PREFERRED_VERSION_libsdl-ttf ?= "2.0.3"
 PREFERRED_VERSION_libsdl-ttf-native ?= "2.0.3"
-PREFERRED_VERSION_libsdl-x11 ?= "1.2.9"
+PREFERRED_VERSION_libsdl-x11 ?= "1.2.11"
 PREFERRED_VERSION_libsettings ?= "0.3"
 PREFERRED_VERSION_libsexy ?= "0.1.11"
 PREFERRED_VERSION_libsidplay ?= "1.36.59"
diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc
index f6888e760f..e8783abb4d 100644
--- a/conf/distro/include/sane-srcdates.inc
+++ b/conf/distro/include/sane-srcdates.inc
@@ -51,6 +51,7 @@ SRCDATE_gnome-vfs ?= "20060119"
 SRCDATE_gtkhtml2 ?= "20060323"
 
 # Misc packages, sorted by alphabet
+SRCDATE_aufs ?= "20080826"
 SRCDATE_avetanabt ?= "20060814"
 SRCDATE_bl ?= "20060814"
 SRCDATE_python-pydirectfb = "20071210"
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 2c0ad6539d..f136c638f4 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -17,6 +17,10 @@ SRCREV_pn-assassin ?= "93"
 SRCREV_pn-bfin-uclibc ?= "1857"
 SRCREV_pn-uclibc ?= "23129"
 SRCREV_pn-uclibc-initial ?= "23129"
+SRCREV_pn-clutter-box2d = "3197"
+SRCREV_pn-clutter-cairo ?= "3210"
+SRCREV_pn-clutter-gst ?= "3188"
+SRCREV_pn-clutter ?= "3240"
 SRCREV_pn-connman ?= "f9f84ccfa0cd338e2de22878f277352436570b83"
 SRCREV_pn-contact ?= "1410"
 SRCREV_pn-dasher-gpe ?= "1251"
@@ -38,7 +42,8 @@ SRCREV_pn-ezxd ?= "2074"
 SRCREV_pn-elf2flt ?= "1786"
 SRCREV_pn-epiphany ?= "7837"
 SRCREV_pn-fbgrab-viewer-native ?= "1943"
-SRCREV_pn-frameworkd ?= "99c8433e0069eceb03497b09ea85bf609cd625fe"
+SRCREV_pn-frameworkd ?= "4619b9d748c5f21d6493b1bacc490934bbd0a62c"
+SRCREV_pn-fso-sounds ?= "fcadedec08294c5eebd176483695828959a76e0b"
 SRCREV_pn-fstests ?= "204"
 SRCREV_pn-gconf-dbus ?= "641"
 SRCREV_pn-gnuradio ?= "6377"
@@ -50,7 +55,7 @@ SRCREV_pn-gypsy ?= "134"
 SRCREV_pn-hildon-1 ?= "14429"
 SRCREV_pn-illume ?= "35605"
 SRCREV_pn-illume-theme-asu ?= "170"
-SRCREV_pn-illume-theme-freesmartphone ?= "da904c73236ced2b04c272af5178eab4d66f144d"
+SRCREV_pn-illume-theme-freesmartphone ?= "fcadedec08294c5eebd176483695828959a76e0b"
 SRCREV_pn-kismet ?= "2285"
 SRCREV_pn-kismet-newcore ?= "2285"
 SRCREV_pn-libcalenabler2 ?= "1410"
@@ -74,8 +79,8 @@ SRCREV_pn-lightmediascanner ?= "68"
 SRCREV_pn-linux-bfin ?= "3758"
 SRCREV_pn-linux-hackndev-2.6 ?= "1308"
 SRCREV_pn-linux-ixp4xx ?= "1066"
-SRCREV_pn-linux-openmoko ?= "88bf43840b9df0eb0a077a1394eb564be80a412e"
-SRCREV_pn-linux-openmoko-devel ?= "7a1370a816b9348dd8f36a667905dd3533cefc9b"
+SRCREV_pn-linux-openmoko ?= "ca19d156400f817960efe0d14680324b2ea34171"
+SRCREV_pn-linux-openmoko-devel ?= "dd323382faf5c169960659d5d78337f06b3ea222"
 SRCREV_pn-llvm-gcc4 ?= "374"
 SRCREV_pn-llvm-gcc4-cross ?= "374"
 SRCREV_pn-maemo-mapper ?= "118"
@@ -84,15 +89,15 @@ SRCREV_pn-matchbox-keyboard ?= "1910"
 SRCREV_pn-matchbox-keyboard-inputmethod ?= "1910"
 SRCREV_pn-matchbox-panel-2 ?= "1626"
 SRCREV_pn-matchbox-stroke ?= "1820"
-SRCREV_pn-mickeydbus ?= "7284c178a66c9fa5b09c658560d26d3f976a79f3"
-SRCREV_pn-mickeyterm ?= "7284c178a66c9fa5b09c658560d26d3f976a79f3"
+SRCREV_pn-mickeydbus ?= "d1f32060474767582dd4248d5e5c2adc63931d5a"
+SRCREV_pn-mickeyterm ?= "d1f32060474767582dd4248d5e5c2adc63931d5a"
 SRCREV_pn-moko-gtk-engine ?= "3612"
 SRCREV_pn-mpd-alsa ?= "6952"
-SRCREV_pn-mplayer ?= "27047"
+SRCREV_pn-mplayer ?= "27380"
 SRCREV_pn-mplayer-maemo ?= "342"
 SRCREV_pn-multitap-pad ?= "373"
 SRCREV_pn-navit ?= "1096"
-SRCREV_pn-neod ?= "4336"
+SRCREV_pn-neod ?= "4617"
 SRCREV_pn-netsurf ?= "3859"
 SRCREV_pn-networkmanager ?= "3202"
 SRCREV_pn-networkmanager-applet ?= "200"
@@ -161,26 +166,27 @@ SRCREV_pn-python-connexion ?= "1283"
 SRCREV_pn-python-formencode = "3148"
 SRCREV_pn-python-gsmd = "148"
 SRCREV_pn-python-lightmediascanner = "68"
-SRCREV_pn-python-pyrtc = "7284c178a66c9fa5b09c658560d26d3f976a79f3"
+SRCREV_pn-python-pyrtc = "d1f32060474767582dd4248d5e5c2adc63931d5a"
 SRCREV_pn-s3c24xx-gpio ?= "4130"
 SRCREV_pn-serial-forward ?= "4214"
 SRCREV_pn-settings-daemon ?= "2006"
 SRCREV_pn-sjf2410-linux-native ?= "4268"
 SRCREV_pn-sphyrna-python ?= "45"
 SRCREV_pn-tichy ?= "168"
+SRCREV_pn-tidy ?= "242"
 SRCREV_pn-tmut ?= "60"
 SRCREV_pn-u-boot-openmoko ?= "ba029a1426bfca169572bf80d50a8b190a6b0e19"
 SRCREV_pn-u-boot-openmoko-devel ?= "ba029a1426bfca169572bf80d50a8b190a6b0e19"
 SRCREV_pn-usbpath ?= "3172"
 SRCREV_pn-usbpath-native ?= "3172"
-SRCREV_pn-webkit-gtk ?= "35533"
+SRCREV_pn-webkit-gtk ?= "35977"
 SRCREV_pn-webkit-qt ?= "28656"
 SRCREV_pn-webkit-qtopia ?= "28656"
 SRCREV_pn-wesnoth ?= "22021"
 SRCREV_pn-wlan-ng-modules ?= "1859"
 SRCREV_pn-wlan-ng-utils ?= "1859"
 SRCREV_pn-xoo ?= "1971"
-SRCREV_pn-xserver-kdrive-glamo ?= "4147f80c0bfedaff7749bccbd1e1d566dee0e04c"
+SRCREV_pn-xserver-kdrive-glamo ?= "4067470ea4d569bae7b4161ca998645a0c9b96e7"
 SRCREV_pn-zhone ?= "69e029bd85a1caaad4e5d61087836a8e1ea20dcc"
 
 # Enlightenment Foundation Libraries