4 files changed, 9 insertions, 10 deletions
diff --git a/conf/distro/include/angstrom-2007-for-openmoko.inc b/conf/distro/include/angstrom-2007-for-openmoko.inc
index 34fbc52cfe..5675e75723 100644
--- a/conf/distro/include/angstrom-2007-for-openmoko.inc
+++ b/conf/distro/include/angstrom-2007-for-openmoko.inc
@@ -230,8 +230,6 @@ DISTRO_EXTRA_RRECOMMENDS += " \
     kernel-module-vfat \
     kernel-module-ext2 \
     kernel-module-af-packet \
-    avahi-daemon \
-    avahi-autoipd \
     openssh-sftp-server \
     "
 
diff --git a/conf/distro/include/preferred-om-2008-versions.inc b/conf/distro/include/preferred-om-2008-versions.inc
index 944fbfa47d..9f4229f224 100644
--- a/conf/distro/include/preferred-om-2008-versions.inc
+++ b/conf/distro/include/preferred-om-2008-versions.inc
@@ -281,7 +281,7 @@ PREFERRED_VERSION_dvb-image ?= "1.0"
 PREFERRED_VERSION_dvbtraffic ?= "0.0cvs20060814"
 PREFERRED_VERSION_dviviewer ?= "1.0.2"
 PREFERRED_VERSION_e2fsprogs ?= "1.38"
-PREFERRED_VERSION_e2fsprogs-libs ?= "1.39"
+PREFERRED_VERSION_e2fsprogs-libs ?= "1.42.2"
 PREFERRED_VERSION_e2fsprogs-libs-native ?= "1.35"
 PREFERRED_VERSION_e2fsprogs-native ?= "1.38"
 PREFERRED_VERSION_e2tools ?= "0.0.16"
@@ -1375,8 +1375,8 @@ PREFERRED_VERSION_openprotium-packages ?= "1.0"
 PREFERRED_VERSION_opensp ?= "1.5"
 PREFERRED_VERSION_opensp-native ?= "1.5"
 PREFERRED_VERSION_openssh ?= "4.6p1"
-PREFERRED_VERSION_openssl ?= "0.9.7g"
-PREFERRED_VERSION_openssl-native ?= "0.9.7g"
+PREFERRED_VERSION_openssl ?= "0.9.8j"
+PREFERRED_VERSION_openssl-native ?= "0.9.8j"
 PREFERRED_VERSION_openswan ?= "2.4.7"
 PREFERRED_VERSION_openttd ?= "0.6.3"
 PREFERRED_VERSION_openvpn ?= "2.0.9"
@@ -1422,7 +1422,7 @@ PREFERRED_VERSION_pax-utils ?= "0.1.13"
 PREFERRED_VERSION_pax-utils-native ?= "0.1.13"
 PREFERRED_VERSION_pbltool-native ?= "0.2"
 PREFERRED_VERSION_pciutils ?= "2.2.4"
-PREFERRED_VERSION_pcmanfm ?= "0.3.2-beta"
+PREFERRED_VERSION_pcmanfm ?= "0.5"
 PREFERRED_VERSION_pcmcia-cs ?= "3.2.8"
 PREFERRED_VERSION_pcmciautils ?= "014"
 PREFERRED_VERSION_pdamaze ?= "1.0.0"
diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc
index fb6aa58566..a2fffdf88d 100644
--- a/conf/distro/include/sane-srcdates.inc
+++ b/conf/distro/include/sane-srcdates.inc
@@ -51,7 +51,7 @@ SRCDATE_gnome-vfs ?= "20060119"
 SRCDATE_gtkhtml2 ?= "20060323"
 
 # Misc packages, sorted by alphabet
-SRCDATE_aufs ?= "20080826"
+SRCDATE_aufs ?= "20081203"
 SRCDATE_avetanabt ?= "20060814"
 SRCDATE_bl ?= "20060814"
 SRCDATE_dvbstream ?= "20060814"
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 876c857f40..d25bd9e738 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -54,6 +54,8 @@ SRCREV_pn-frameworkd-devel ?= "${SRCREV_pn-frameworkd}"
 SRCREV_pn-fsod ?= "3fa5eb6f2edcf7c9f0fc2027fda47b91d9f0f136"
 SRCREV_pn-fso-apm ?= "eb39ce7fb81bfa64e1a9eb5f142ca3d1065be3fa"
 SRCREV_pn-fso-gpsd ?= "15f75f335efb52dd50a22a05f47a0f63eb07378b"
+SRCREV_pn-fso-gsm0710muxd ?= "95151f9e2fe37e0989b981027deefa3821a3b4e5"
+SRCREV_pn-fso-monitord ?= "31b4d3d1a40b1cc2cbe186e5ea80490a0c80b55f"
 SRCREV_pn-fso-sounds ?= "b24d3c2e66fee10a5e288101cd1b6f5bbd3da7e2"
 SRCREV_pn-fstests ?= "204"
 SRCREV_pn-gconf-dbus ?= "641"
@@ -61,7 +63,6 @@ SRCREV_pn-gnuradio ?= "9809"
 SRCREV_pn-gpe-contacts ?= "9312"
 SRCREV_pn-gpe-sketchbook ?= "9547"
 SRCREV_pn-gpe-conf ?= "9798"
-SRCREV_pn-gsm0710muxd ?= "95151f9e2fe37e0989b981027deefa3821a3b4e5"
 SRCREV_pn-gsmd2 ?= "963f34df8fa3ff4b301079dcf86e9acea6b6fe0f"
 SRCREV_pn-gtkhtml2 ?= "1158"
 SRCREV_pn-gypsy ?= "134"
@@ -112,7 +113,7 @@ SRCREV_pn-moblin-proto ?= "8f2cb524fe06555182c25b4ba3202d7b368ac0ce"
 SRCREV_pn-moko-gtk-engine ?= "4734"
 SRCREV_pn-mokoko ?= "127"
 SRCREV_pn-mpd-alsa ?= "6952"
-SRCREV_pn-mplayer ?= "27659"
+SRCREV_pn-mplayer ?= "28311"
 SRCREV_pn-mplayer-maemo ?= "342"
 SRCREV_pn-multicat ?= "eb39ce7fb81bfa64e1a9eb5f142ca3d1065be3fa"
 SRCREV_pn-multitap-pad ?= "373"
@@ -220,7 +221,7 @@ SRCREV_pn-uclibc-initial ?= "24279"
 SRCREV_pn-usbpath ?= "3172"
 SRCREV_pn-usbpath-native ?= "3172"
 SRCREV_pn-vala-terminal ?= "502d62d7eb100f86380b0e78474cc360ad7944b5"
-SRCREV_pn-webkit-gtk ?= "36540"
+SRCREV_pn-webkit-gtk ?= "39964"
 SRCREV_pn-webkit-qt ?= "28656"
 SRCREV_pn-webkit-qtopia ?= "28656"
 SRCREV_pn-wlan-ng-modules ?= "1859"