merge of '7a5a4709034423139d7001ca7861c3d0ac73e140'

     and 'b0e1f4cc3e0bf1bed8a04464efb7be20824683fa'

3 files changed, 13 insertions, 33 deletions

diff --git a/conf/distro/include/angstrom-2007-preferred-versions.inc b/conf/distro/include/angstrom-2007-preferred-versions.inc
index e0989b481f..aaa503edb9 100644
--- a/conf/distro/include/angstrom-2007-preferred-versions.inc
+++ b/conf/distro/include/angstrom-2007-preferred-versions.inc
@@ -838,7 +838,7 @@ PREFERRED_VERSION_libcompress-zlib-perl-native ?= "1.42"
 PREFERRED_VERSION_libcontactsdb ?= "0.5"
 PREFERRED_VERSION_libcroco ?= "0.6.1"
 PREFERRED_VERSION_libcwd ?= "0.99.47"
-PREFERRED_VERSION_libdaemon ?= "0.11"
+PREFERRED_VERSION_libdaemon ?= "0.12"
 PREFERRED_VERSION_libdata-optlist-perl ?= "0.101"
 PREFERRED_VERSION_libdata-optlist-perl-native ?= "0.101"
 PREFERRED_VERSION_libdbi ?= "0.7.2"
@@ -995,7 +995,7 @@ PREFERRED_VERSION_libpcl ?= "1.4"
 PREFERRED_VERSION_libpcre ?= "4.4"
 PREFERRED_VERSION_libpcre-native ?= "4.4"
 PREFERRED_VERSION_libperl6-junction-perl ?= "1.10"
-PREFERRED_VERSION_libpixman ?= "0.1.6"
+PREFERRED_VERSION_libpixman ?= "0.9.6"
 PREFERRED_VERSION_libpng ?= "1.2.20"
 PREFERRED_VERSION_libpng-native ?= "1.2.20"
 PREFERRED_VERSION_libpthread-stubs ?= "0.1"
@@ -1074,7 +1074,7 @@ PREFERRED_VERSION_libwindowswm ?= "1.0.0"
 PREFERRED_VERSION_libwnck ?= "2.13.5"
 PREFERRED_VERSION_libwpd ?= "0.8.6"
 PREFERRED_VERSION_libx11 ?= "1.1.3"
-PREFERRED_VERSION_libx11-native ?= "1.0.1"
+PREFERRED_VERSION_libx11-native = "1.0.3"
 PREFERRED_VERSION_libxau ?= "1.0.3"
 PREFERRED_VERSION_libxau-native ?= "1.0.3"
 PREFERRED_VERSION_libxaw ?= "1.0.4"
@@ -1236,7 +1236,7 @@ PREFERRED_VERSION_miau ?= "0.5.3"
 PREFERRED_VERSION_micro-emacs ?= "20060909"
 PREFERRED_VERSION_microcom ?= "1.02"
 PREFERRED_VERSION_microwindows ?= "0.90"
-PREFERRED_VERSION_midori ?= "0.0.10"
+PREFERRED_VERSION_midori ?= "0.0.13"
 PREFERRED_VERSION_midpath ?= "0.1"
 PREFERRED_VERSION_midpath-alsa ?= "0.1"
 PREFERRED_VERSION_midpath-cldc ?= "0.1"
@@ -1274,6 +1274,7 @@ PREFERRED_VERSION_modutils-cross ?= "2.4.27"
 PREFERRED_VERSION_modutils-initscripts ?= "1.0"
 PREFERRED_VERSION_moin ?= "1.5.8"
 PREFERRED_VERSION_mono ?= "1.2.5.1"
+PREFERRED_VERSION_mono-mcs-intermediate ?= "1.2.5.1"
 PREFERRED_VERSION_mono-native ?= "1.2.5.1"
 PREFERRED_VERSION_monotone-4 ?= "0.19"
 PREFERRED_VERSION_monotone-5 ?= "0.25.2"
@@ -1352,7 +1353,7 @@ PREFERRED_VERSION_obby ?= "0.4.1"
 PREFERRED_VERSION_obexftp ?= "0.20"
 PREFERRED_VERSION_obexpush ?= "1.0.0"
 PREFERRED_VERSION_obexpush-native ?= "1.0.0"
-PREFERRED_VERSION_octave ?= "2.9.14"
+PREFERRED_VERSION_octave ?= "2.1.73"
 PREFERRED_VERSION_offlineimap ?= "4.0.14"
 PREFERRED_VERSION_olsr ?= "0.3-1"
 PREFERRED_VERSION_olsrd ?= "0.5.3"
@@ -1438,7 +1439,7 @@ PREFERRED_VERSION_pine ?= "4.64"
 PREFERRED_VERSION_pipeman ?= "1.0.0"
 PREFERRED_VERSION_pipepanic ?= "0.1.1"
 PREFERRED_VERSION_pivotinit ?= "1.0.0"
-PREFERRED_VERSION_pixman ?= "0.9.5"
+PREFERRED_VERSION_pixman ?= "0.9.6"
 PREFERRED_VERSION_pixops-test ?= "1.0"
 PREFERRED_VERSION_pkgconfig ?= "0.22"
 PREFERRED_VERSION_pkgconfig-native ?= "0.22"
diff --git a/conf/distro/include/moko-autorev.inc b/conf/distro/include/moko-autorev.inc
index 316fc5a4de..2cc722f013 100644
--- a/conf/distro/include/moko-autorev.inc
+++ b/conf/distro/include/moko-autorev.inc
@@ -10,31 +10,19 @@ SRCREV_pn-linux-openmoko-devel ?= "${AUTOREV}"
 SRCREV_pn-moko-gtk-engine ?= "${AUTOREV}"
 SRCREV_pn-neod ?= "${AUTOREV}"
 
-SRCREV_pn-openmoko-appmanager ?= "${AUTOREV}"
 SRCREV_pn-openmoko-appmanager2 ?= "${AUTOREV}"
 SRCREV_pn-openmoko-appearance ?= "${AUTOREV}"
 SRCREV_pn-openmoko-browser2 ?= "${AUTOREV}"
-SRCREV_pn-openmoko-calculator ?= "${AUTOREV}"
 SRCREV_pn-openmoko-calculator2 ?= "${AUTOREV}"
-SRCREV_pn-openmoko-common ?= "${AUTOREV}"
 SRCREV_pn-openmoko-common2 ?= "${AUTOREV}"
-SRCREV_pn-openmoko-contacts ?= "${AUTOREV}"
 SRCREV_pn-openmoko-contacts2 ?= "${AUTOREV}"
-SRCREV_pn-openmoko-dates ?= "${AUTOREV}"
 SRCREV_pn-openmoko-dates2 ?= "${AUTOREV}"
-SRCREV_pn-openmoko-dialer ?= "${AUTOREV}"
 SRCREV_pn-openmoko-dialer2 ?= "${AUTOREV}"
 SRCREV_pn-openmoko-feedreader2 ?= "${AUTOREV}"
-SRCREV_pn-openmoko-finger-demo ?= "${AUTOREV}"
 SRCREV_pn-openmoko-firststart2 ?= "${AUTOREV}"
-SRCREV_pn-openmoko-footer ?= "${AUTOREV}"
-SRCREV_pn-openmoko-icon-theme-standard ?= "${AUTOREV}"
 SRCREV_pn-openmoko-icon-theme-standard2 ?= "${AUTOREV}"
 SRCREV_pn-openmoko-icon-theme-standard2-qvga ?= "${AUTOREV}"
-SRCREV_pn-openmoko-keyboard ?= "${AUTOREV}"
-SRCREV_pn-openmoko-libs ?= "${AUTOREV}"
 SRCREV_pn-openmoko-mediaplayer2 ?= "${AUTOREV}"
-SRCREV_pn-openmoko-messages ?= "${AUTOREV}"
 SRCREV_pn-openmoko-messages2 ?= "${AUTOREV}"
 SRCREV_pn-openmoko-panel-battery ?= "${AUTOREV}"
 SRCREV_pn-openmoko-panel-bt ?= "${AUTOREV}"
@@ -46,21 +34,11 @@ SRCREV_pn-openmoko-panel-gsm ?= "${AUTOREV}"
 SRCREV_pn-openmoko-panel-mainmenu ?= "${AUTOREV}"
 SRCREV_pn-openmoko-panel-usb ?= "${AUTOREV}"
 SRCREV_pn-openmoko-sample2 ?= "${AUTOREV}"
-SRCREV_pn-openmoko-session ?= "${AUTOREV}"
-SRCREV_pn-openmoko-simplemediaplayer ?= "${AUTOREV}"
-SRCREV_pn-openmoko-sound-theme-standard ?= "${AUTOREV}"
 SRCREV_pn-openmoko-sound-theme-standard2 ?= "${AUTOREV}"
-SRCREV_pn-openmoko-stylus-demo ?= "${AUTOREV}"
-SRCREV_pn-openmoko-stylus-demo-simple ?= "${AUTOREV}"
-SRCREV_pn-openmoko-taskmanager ?= "${AUTOREV}"
-SRCREV_pn-openmoko-tasks ?= "${AUTOREV}"
 SRCREV_pn-openmoko-tasks2 ?= "${AUTOREV}"
 SRCREV_pn-openmoko-terminal2 ?= "${AUTOREV}"
-SRCREV_pn-openmoko-theme-standard ?= "${AUTOREV}"
-SRCREV_pn-openmoko-theme-standard-qvga ?= "${AUTOREV}"
 SRCREV_pn-openmoko-theme-standard2 ?= "${AUTOREV}"
 SRCREV_pn-openmoko-theme-standard2-qvga ?= "${AUTOREV}"
-SRCREV_pn-openmoko-today ?= "${AUTOREV}"
 SRCREV_pn-openmoko-today2 ?= "${AUTOREV}"
 SRCREV_pn-openmoko-today2-folders ?= "${AUTOREV}"
 SRCREV_pn-openmoko-worldclock2 ?= "${AUTOREV}"
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index a65f477296..2a3017afdf 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -62,7 +62,7 @@ SRCREV_pn-osb-nrcore ?= "126"
 SRCREV_pn-openmoko-appearance ?= "3239"
 SRCREV_pn-openmoko-appmanager ?= "1851"
 SRCREV_pn-openmoko-appmanager2 ?= "3442"
-SRCREV_pn-openmoko-browser2 ?= "3249"
+SRCREV_pn-openmoko-browser2 ?= "3646"
 SRCREV_pn-openmoko-calculator ?= "2404"
 SRCREV_pn-openmoko-calculator2 ?= "3235"
 SRCREV_pn-openmoko-common ?= "397"
@@ -73,7 +73,7 @@ SRCREV_pn-openmoko-dates ?= "467"
 SRCREV_pn-openmoko-dates2 ?= "661"
 SRCREV_pn-openmoko-dialer ?= "2811"
 SRCREV_pn-openmoko-dialer2 ?= "3522"
-SRCREV_pn-openmoko-feedreader2 ?= "3080"
+SRCREV_pn-openmoko-feedreader2 ?= "3645"
 SRCREV_pn-openmoko-finger-demo ?= "1671"
 SRCREV_pn-openmoko-firststart2 ?= "3158"
 SRCREV_pn-openmoko-footer ?= "2354"
@@ -94,6 +94,7 @@ SRCREV_pn-openmoko-panel-gps ?= "2900"
 SRCREV_pn-openmoko-panel-gsm ?= "3256"
 SRCREV_pn-openmoko-panel-mainmenu ?= "2567"
 SRCREV_pn-openmoko-panel-usb ?= "3360"
+SRCREV_pn-openmoko-sample2 ?= "3528"
 SRCREV_pn-openmoko-session ?= "152"
 SRCREV_pn-openmoko-sample2 ?= "3537"
 SRCREV_pn-openmoko-simplemediaplayer ?= "1688"
@@ -121,9 +122,9 @@ SRCREV_pn-settings-daemon ?= "1755"
 SRCREV_pn-sjf2410-linux-native ?= "933"
 SRCREV_pn-sphyrna ?= "45"
 SRCREV_pn-tmut ?= "60"
-SRCREV_pn-webkit-gtk ?= "27222"
-SRCREV_pn-webkit-qt ?= "27222"
-SRCREV_pn-webkit-qtopia ?= "27222"
+SRCREV_pn-webkit-gtk ?= "28656"
+SRCREV_pn-webkit-qt ?= "28656"
+SRCREV_pn-webkit-qtopia ?= "28656"
 SRCREV_pn-wesnoth ?= "22021"
 SRCREV_pn-xoo ?= "1623"
 SRCREV_pn-mplayer ?= "24587"