merge of '55c714e37be4606a4166b3df883d5f404d3889bf'

     and 'd714000fc8a6b75093a93f01782724b65d31eac1'

3 files changed, 26 insertions, 20 deletions

diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf
index c78e149e6d..d291fbd3ac 100644
--- a/conf/distro/angstrom-2007.1.conf
+++ b/conf/distro/angstrom-2007.1.conf
@@ -312,7 +312,7 @@ PREFERRED_VERSION_glibc-initial ?= "2.5"
 PREFERRED_VERSION_busybox = "1.2.1"
 
 PREFERRED_VERSION_dbus ?= "1.0.2"
-PREFERRED_VERSION_dbus-glib ?= "0.72"
+PREFERRED_VERSION_dbus-glib ?= "0.74"
 
 PREFERRED_VERSION_wpa-supplicant = "0.5.5"
 
diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf
index 60557325a9..cdf2970201 100644
--- a/conf/distro/angstrom-2008.1.conf
+++ b/conf/distro/angstrom-2008.1.conf
@@ -8,7 +8,7 @@
 
 
 # Use Xorg R7.3 release
-require conf/distro/include/preferred-xorg-versions-X11R7.3.inc
+require conf/distro/include/preferred-xorg-versions-X11R7.2.inc
 
 
 # This is a testbed for unstable and/or untested things, while angstrom-2007.1 
@@ -42,3 +42,6 @@ PREFERRED_VERSION_gtk+             	= "2.12.0"
 PREFERRED_VERSION_glib-2.0              = "2.14.0"
 PREFERRED_VERSION_pango                 = "1.18.1"
 
+# prefer newest for speed and fun
+PREFERRED_VERSION_udev			= "115"
+
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 3330ecff4d..008881ed99 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -17,12 +17,12 @@ SRCREV_pn-fbgrab-viewer-native ?= "1943"
 SRCREV_pn-fstests ?= "204"
 SRCREV_pn-gconf-dbus ?= "606"
 SRCREV_pn-gnuradio ?= "6377"
-SRCREV_pn-hildon-1 ?= "13708"
-SRCREV_pn-libgsmd ?= "2957"
+SRCREV_pn-hildon-1 ?= "14173"
+SRCREV_pn-libgsmd ?= "3074"
 SRCREV_pn-libmokogsmd2 ?= "2950"
 SRCREV_pn-libmokojournal2 ?= "2780"
 SRCREV_pn-libmokopanelui2 ?= "2958"
-SRCREV_pn-libmokoui2 ?= "3032"
+SRCREV_pn-libmokoui2 ?= "3064"
 SRCREV_pn-libowl ?= "277"
 SRCREV_pn-libxosd ?= "627"
 SRCREV_pn-linux-hackndev-2.6 ?= "1308"
@@ -33,7 +33,7 @@ SRCREV_pn-matchbox-desktop-2 ?= "1649"
 SRCREV_pn-matchbox-keyboard ?= "1675"
 SRCREV_pn-matchbox-keyboard-inputmethod ?= "1675"
 SRCREV_pn-matchbox-panel-2 ?= "1626"
-SRCREV_moko-gtk-engine ?= "3029"
+SRCREV_pn-moko-gtk-engine ?= "3069"
 SRCREV_pn-neod ?= "2956"
 SRCREV_pn-oh-puzzles ?= "22"
 SRCREV_pn-osb-browser ?= "125"
@@ -41,27 +41,28 @@ SRCREV_pn-osb-jscore ?= "117"
 SRCREV_pn-osb-nrcit ?= "125"
 SRCREV_pn-osb-nrcore ?= "126"
 SRCREV_pn-openmoko-appmanager ?= "1851"
-SRCREV_pn-openmoko-browser2 ?= "3031"
+SRCREV_pn-openmoko-appmanager2 ?= "3090"
+SRCREV_pn-openmoko-browser2 ?= "3082"
 SRCREV_pn-openmoko-calculator ?= "2404"
 SRCREV_pn-openmoko-calculator2 ?= "2789"
 SRCREV_pn-openmoko-common ?= "397"
 SRCREV_pn-openmoko-common2 ?= "2679"
 SRCREV_pn-openmoko-contacts ?= "2298"
-SRCREV_pn-openmoko-contacts2 ?= "335"
+SRCREV_pn-openmoko-contacts2 ?= "350"
 SRCREV_pn-openmoko-dates ?= "467"
-SRCREV_pn-openmoko-dates2 ?= "563"
+SRCREV_pn-openmoko-dates2 ?= "617"
 SRCREV_pn-openmoko-dialer ?= "2811"
-SRCREV_pn-openmoko-dialer2 ?= "2976"
-SRCREV_pn-openmoko-feedreader2 ?= "2944"
+SRCREV_pn-openmoko-dialer2 ?= "3073"
+SRCREV_pn-openmoko-feedreader2 ?= "3080"
 SRCREV_pn-openmoko-finger-demo ?= "1671"
 SRCREV_pn-openmoko-firststart2 ?= "2873"
 SRCREV_pn-openmoko-footer ?= "2354"
 SRCREV_pn-openmoko-icon-theme-standard ?= "2232"
-SRCREV_pn-openmoko-icon-theme-standard2 ?= "2967"
-SRCREV_pn-openmoko-icon-theme-standard2-qvga ?= "2967"
+SRCREV_pn-openmoko-icon-theme-standard2 ?= "3066"
+SRCREV_pn-openmoko-icon-theme-standard2-qvga ?= "3066"
 SRCREV_pn-openmoko-keyboard ?= "1631"
 SRCREV_pn-openmoko-libs ?= "2367"
-SRCREV_pn-openmoko-mediaplayer2 ?= "2952"
+SRCREV_pn-openmoko-mediaplayer2 ?= "3057"
 SRCREV_pn-openmoko-messages ?= "2276"
 SRCREV_pn-openmoko-panel-battery ?= "2897"
 SRCREV_pn-openmoko-panel-bt ?= "2896"
@@ -69,7 +70,7 @@ SRCREV_pn-openmoko-panel-clock ?= "2567"
 SRCREV_pn-openmoko-panel-demo ?= "1622"
 SRCREV_pn-openmoko-panel-demo-simple ?= "1328"
 SRCREV_pn-openmoko-panel-gps ?= "2900"
-SRCREV_pn-openmoko-panel-gsm ?= "2936"
+SRCREV_pn-openmoko-panel-gsm ?= "3074"
 SRCREV_pn-openmoko-panel-mainmenu ?= "2567"
 SRCREV_pn-openmoko-panel-usb ?= "2893"
 SRCREV_pn-openmoko-session ?= "152"
@@ -79,14 +80,14 @@ SRCREV_pn-openmoko-stylus-demo ?= "2324"
 SRCREV_pn-openmoko-stylus-demo-simple ?= "1818"
 SRCREV_pn-openmoko-taskmanager ?= "1663"
 SRCREV_pn-openmoko-tasks ?= "320"
-SRCREV_pn-openmoko-tasks2 ?= "320"
+SRCREV_pn-openmoko-tasks2 ?= "343"
 SRCREV_pn-openmoko-terminal2 ?= "2972"
 SRCREV_pn-openmoko-theme-standard ?= "2370"
 SRCREV_pn-openmoko-theme-standard-qvga ?= "2370"
-SRCREV_pn-openmoko-theme-standard2 ?= "2964"
+SRCREV_pn-openmoko-theme-standard2 ?= "3044"
 SRCREV_pn-openmoko-theme-standard2-qvga ?= "2964"
-SRCREV_pn-openmoko-today ?= "2556"
-SRCREV_pn-openmoko-today2 ?= "2955"
+SRCREV_pn-openmoko-today ?= "3056"
+SRCREV_pn-openmoko-today2 ?= "3088"
 SRCREV_pn-openmoko-today2-folders ?= "2680"
 SRCREV_pn-openocd ?= "206"
 SRCREV_pn-openocd-native ?= "206"
@@ -94,7 +95,9 @@ SRCREV_pn-psplash ?= "249"
 SRCREV_pn-settings-daemon ?= "1615"
 SRCREV_pn-sjf2410-linux-native ?= "933"
 SRCREV_pn-sphyrna ?= "44"
-SRCREV_pn-webkit-gtk ?= "25615"
+SRCREV_pn-webkit-gtk ?= "26079"
 SRCREV_pn-xoo ?= "1623"
 SRCREV_pn-mplayer ?= "24587"
+SRCREV_pn-networkmanager ?= "2887"
+SRCREV_pn-networkmanager-applet ?= "200"