merge of '7370b7cb2be2fee991acda2f9f3376b3f7b46a68'

     and '8b47107ec4e62cba68868b4e79de81c71361255a'

12 files changed, 190 insertions, 51 deletions

diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf
index 0bf19031f7..9b3c3fed11 100644
--- a/conf/distro/angstrom-2007.1.conf
+++ b/conf/distro/angstrom-2007.1.conf
@@ -11,6 +11,7 @@ DISTRO_VERSION = "2007.9-test-${DATE}"
 DISTRO_REVISION = "46"
 
 require conf/distro/include/sane-srcdates.inc
+require conf/distro/include/sane-srcrevs.inc
 
 #Images built can have to modes:
 # 'debug': empty rootpassword, strace and gdb included
diff --git a/conf/distro/include/insane-srcrevs.inc b/conf/distro/include/insane-srcrevs.inc
new file mode 100644
index 0000000000..d31dc607ad
--- /dev/null
+++ b/conf/distro/include/insane-srcrevs.inc
@@ -0,0 +1,75 @@
+SRCREV_pn-dfu-util="${AUTOREV}"
+SRCREV_pn-dfu-util-native="${AUTOREV}"
+SRCREV_pn-eglibc="${AUTOREV}"
+SRCREV_pn-eglibc-initial="${AUTOREV}"
+SRCREV_pn-eglibc-intermediate="${AUTOREV}"
+SRCREV_pn-ezxd="${AUTOREV}"
+SRCREV_pn-fbgrab-viewer-native="${AUTOREV}"
+SRCREV_pn-fstests="${AUTOREV}"
+SRCREV_pn-gnuradio="${AUTOREV}"
+SRCREV_pn-hildon-1="${AUTOREV}"
+SRCREV_pn-libgsmd="${AUTOREV}"
+SRCREV_pn-libmokogsmd2="${AUTOREV}"
+SRCREV_pn-libmokojournal2="${AUTOREV}"
+SRCREV_pn-libmokopanelui2="${AUTOREV}"
+SRCREV_pn-libmokoui2="${AUTOREV}"
+SRCREV_pn-libowl="${AUTOREV}"
+SRCREV_pn-libxosd="${AUTOREV}"
+SRCREV_pn-llvm-gcc4="${AUTOREV}"
+SRCREV_pn-llvm-gcc4-cross="${AUTOREV}"
+SRCREV_pn-maemo-mapper="${AUTOREV}"
+SRCREV_pn-matchbox-desktop-2="${AUTOREV}"
+SRCREV_pn-matchbox-keyboard="${AUTOREV}"
+SRCREV_pn-matchbox-keyboard-inputmethod="${AUTOREV}"
+SRCREV_pn-matchbox-panel-2="${AUTOREV}"
+SRCREV_pn-neod="${AUTOREV}"
+SRCREV_pn-oh-puzzles="${AUTOREV}"
+SRCREV_pn-openmoko-appmanager="${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-keyboard="${AUTOREV}"
+SRCREV_pn-openmoko-libs="${AUTOREV}"
+SRCREV_pn-openmoko-mediaplayer2="${AUTOREV}"
+SRCREV_pn-openmoko-messages="${AUTOREV}"
+SRCREV_pn-openmoko-panel-battery="${AUTOREV}"
+SRCREV_pn-openmoko-panel-bt="${AUTOREV}"
+SRCREV_pn-openmoko-panel-clock="${AUTOREV}"
+SRCREV_pn-openmoko-panel-demo="${AUTOREV}"
+SRCREV_pn-openmoko-panel-demo-simple="${AUTOREV}"
+SRCREV_pn-openmoko-panel-gps="${AUTOREV}"
+SRCREV_pn-openmoko-panel-gsm="${AUTOREV}"
+SRCREV_pn-openmoko-panel-mainmenu="${AUTOREV}"
+SRCREV_pn-openmoko-panel-usb="${AUTOREV}"
+SRCREV_pn-openmoko-session="${AUTOREV}"
+SRCREV_pn-openmoko-simplemediaplayer="${AUTOREV}"
+SRCREV_pn-openmoko-sound-theme-standard="${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-theme-standard="${AUTOREV}"
+SRCREV_pn-openmoko-theme-standard-qvga="${AUTOREV}"
+SRCREV_pn-openmoko-today="${AUTOREV}"
+SRCREV_pn-openmoko-today2="${AUTOREV}"
+SRCREV_pn-openmoko-today2-folders="${AUTOREV}"
+SRCREV_pn-psplash="${AUTOREV}"
+SRCREV_pn-settings-daemon="${AUTOREV}"
+SRCREV_pn-sjf2410-linux-native="${AUTOREV}"
+SRCREV_pn-sphyrna="${AUTOREV}"
+SRCREV_pn-webkit-gtk="${AUTOREV}"
+SRCREV_pn-xoo="${AUTOREV}"
diff --git a/conf/distro/include/moko-autorev.inc b/conf/distro/include/moko-autorev.inc
new file mode 100644
index 0000000000..2f49aae04d
--- /dev/null
+++ b/conf/distro/include/moko-autorev.inc
@@ -0,0 +1,43 @@
+SRCREV_pn-openmoko-appmanager="${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-keyboard="${AUTOREV}"
+SRCREV_pn-openmoko-libs="${AUTOREV}"
+SRCREV_pn-openmoko-mediaplayer2="${AUTOREV}"
+SRCREV_pn-openmoko-messages="${AUTOREV}"
+SRCREV_pn-openmoko-panel-battery="${AUTOREV}"
+SRCREV_pn-openmoko-panel-bt="${AUTOREV}"
+SRCREV_pn-openmoko-panel-clock="${AUTOREV}"
+SRCREV_pn-openmoko-panel-demo="${AUTOREV}"
+SRCREV_pn-openmoko-panel-demo-simple="${AUTOREV}"
+SRCREV_pn-openmoko-panel-gps="${AUTOREV}"
+SRCREV_pn-openmoko-panel-gsm="${AUTOREV}"
+SRCREV_pn-openmoko-panel-mainmenu="${AUTOREV}"
+SRCREV_pn-openmoko-panel-usb="${AUTOREV}"
+SRCREV_pn-openmoko-session="${AUTOREV}"
+SRCREV_pn-openmoko-simplemediaplayer="${AUTOREV}"
+SRCREV_pn-openmoko-sound-theme-standard="${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-theme-standard="${AUTOREV}"
+SRCREV_pn-openmoko-theme-standard-qvga="${AUTOREV}"
+SRCREV_pn-openmoko-today="${AUTOREV}"
+SRCREV_pn-openmoko-today2="${AUTOREV}"
+SRCREV_pn-openmoko-today2-folders="${AUTOREV}"
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index de00bfb30a..f67787e197 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -7,25 +7,30 @@
 
 SRCREV_pn-dfu-util="2866"
 SRCREV_pn-dfu-util-native="2866"
-SRCREV_pn-eglibc="3376"
-SRCREV_pn-eglibc-initial="3376"
-SRCREV_pn-eglibc-intermediate="3376"
-SRCREV_pn-elf2flt="1786"
-SRCREV_pn-gnuradio="6316"
-SRCREV_pn-hildon-1="13599"
+SRCREV_pn-eglibc="3468"
+SRCREV_pn-eglibc-initial="3468"
+SRCREV_pn-eglibc-intermediate="3468"
+SRCREV_pn-ezxd="2052"
+SRCREV_pn-fbgrab-viewer-native="1943"
+SRCREV_pn-fstests="204"
+SRCREV_pn-gnuradio="6377"
+SRCREV_pn-hildon-1="13708"
 SRCREV_pn-libgsmd="2806"
-SRCREV_pn-libmokogsmd2="2780"
+SRCREV_pn-libmokogsmd2="2950"
 SRCREV_pn-libmokojournal2="2780"
-SRCREV_pn-libmokopanelui2="2892"
+SRCREV_pn-libmokopanelui2="2958"
 SRCREV_pn-libmokoui2="2868"
 SRCREV_pn-libowl="277"
 SRCREV_pn-libxosd="627"
-SRCREV_pn-llvm-gcc4="41698"
-SRCREV_pn-llvm-gcc4-cross="41698"
+SRCREV_pn-llvm-gcc4="374"
+SRCREV_pn-llvm-gcc4-cross="374"
+SRCREV_pn-maemo-mapper="108"
 SRCREV_pn-matchbox-desktop-2="1649"
 SRCREV_pn-matchbox-keyboard="1583"
+SRCREV_pn-matchbox-keyboard-inputmethod="1583"
 SRCREV_pn-matchbox-panel-2="1626"
-SRCREV_pn-neod="2901"
+SRCREV_pn-neod="2956"
+SRCREV_pn-oh-puzzles="22"
 SRCREV_pn-openmoko-appmanager="1851"
 SRCREV_pn-openmoko-calculator="2404"
 SRCREV_pn-openmoko-calculator2="2789"
@@ -34,9 +39,10 @@ SRCREV_pn-openmoko-common2="2679"
 SRCREV_pn-openmoko-contacts="2298"
 SRCREV_pn-openmoko-contacts2="335"
 SRCREV_pn-openmoko-dates="467"
+SRCREV_pn-openmoko-dates2="563"
 SRCREV_pn-openmoko-dialer="2811"
-SRCREV_pn-openmoko-dialer2="2869"
-SRCREV_pn-openmoko-feedreader2="2905"
+SRCREV_pn-openmoko-dialer2="2946"
+SRCREV_pn-openmoko-feedreader2="2944"
 SRCREV_pn-openmoko-finger-demo="1671"
 SRCREV_pn-openmoko-firststart2="2873"
 SRCREV_pn-openmoko-footer="2354"
@@ -44,7 +50,7 @@ SRCREV_pn-openmoko-icon-theme-standard="2232"
 SRCREV_pn-openmoko-icon-theme-standard2="2840"
 SRCREV_pn-openmoko-keyboard="1631"
 SRCREV_pn-openmoko-libs="2367"
-SRCREV_pn-openmoko-mediaplayer2="2883"
+SRCREV_pn-openmoko-mediaplayer2="2952"
 SRCREV_pn-openmoko-messages="2276"
 SRCREV_pn-openmoko-panel-battery="2897"
 SRCREV_pn-openmoko-panel-bt="2896"
@@ -52,7 +58,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="2894"
+SRCREV_pn-openmoko-panel-gsm="2936"
 SRCREV_pn-openmoko-panel-mainmenu="2567"
 SRCREV_pn-openmoko-panel-usb="2893"
 SRCREV_pn-openmoko-session="152"
@@ -66,8 +72,11 @@ SRCREV_pn-openmoko-tasks2="320"
 SRCREV_pn-openmoko-theme-standard="2370"
 SRCREV_pn-openmoko-theme-standard-qvga="2370"
 SRCREV_pn-openmoko-today="2556"
-SRCREV_pn-openmoko-today2="2919"
+SRCREV_pn-openmoko-today2="2955"
 SRCREV_pn-openmoko-today2-folders="2680"
-SRCREV_pn-sphyrna="43"
-SRCREV_pn-webkit-gtk="webcore"
+SRCREV_pn-psplash="249"
+SRCREV_pn-settings-daemon="1615"
+SRCREV_pn-sjf2410-linux-native="933"
+SRCREV_pn-sphyrna="44"
+SRCREV_pn-webkit-gtk="25507"
 SRCREV_pn-xoo="1623"
diff --git a/packages/alsa/alsa-state.bb b/packages/alsa/alsa-state.bb
index 00669e48de..55541872fa 100644
--- a/packages/alsa/alsa-state.bb
+++ b/packages/alsa/alsa-state.bb
@@ -1,20 +1,19 @@
-#! /bin/sh
-#
 # Copyright Matthias Hentges <devel@hentges.net> (c) 2007
 # License: MIT (see http://www.opensource.org/licenses/mit-license.php
 #               for a copy of the license)
 #
 # Filename: alsa-state.bb
-# Date: 20070308 (YMD)
 
 DESCRIPTION = "Default ALSA configuration"
 LICENSE = "GPL"
 RRECOMMENDS_alsa-state = "alsa-states"
-PV = "0.0.4"
-PR = "r3"
+PV = "0.1.0"
+PR = "r0"
 
-SRC_URI = "file://asound.state \
-           file://alsa-state "
+SRC_URI = " \
+  file://asoundrc \
+  file://asound.state \
+  file://alsa-state "
 
 SRC_URI_append_fic-gta01 = " \
   file://capturehandset.state \
@@ -33,11 +32,12 @@ do_install() {
     install -d ${D}${sysconfdir}/init.d
     install -m 0755 ${WORKDIR}/alsa-state ${D}${sysconfdir}/init.d
 
+	install -m 0644 ${WORKDIR}/asoundrc ${D}${sysconfdir}
 	install -m 0644 ${WORKDIR}/*.state ${D}${sysconfdir}
 }
 
 PACKAGES += "alsa-states"
-FILES_${PN} = "${sysconfdir}/init.d"
+FILES_${PN} = "${sysconfdir}/init.d ${sysconfdir}/asoundrc"
 FILES_alsa-states = "${sysconfdir}/*.state"
 PACKAGE_ARCH_${PN} = "all"
 PACKAGE_ARCH_alsa-states = "${MACHINE}"
diff --git a/packages/alsa/alsa-state/asoundrc b/packages/alsa/alsa-state/asoundrc
new file mode 100644
index 0000000000..bc038e3e73
--- /dev/null
+++ b/packages/alsa/alsa-state/asoundrc
@@ -0,0 +1,12 @@
+#
+# simple dmix configuration
+#
+pcm.dsp0 {
+    type plug
+    slave.pcm "dmix"
+}
+
+ctl.mixer0 {
+    type hw
+    card 0
+}
diff --git a/packages/gpicview/.mtn2git_empty b/packages/gpicview/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/gpicview/.mtn2git_empty
diff --git a/packages/gpicview/gpicview_0.1.5.bb b/packages/gpicview/gpicview_0.1.5.bb
new file mode 100644
index 0000000000..14248ec14f
--- /dev/null
+++ b/packages/gpicview/gpicview_0.1.5.bb
@@ -0,0 +1,10 @@
+DESCRIPTION = "Extremely lightweight and fast with low memory usage"
+LICENSE = "GPL"
+
+DEPENDS = "gtk+"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/lxde/${PN}-${PV}.tar.gz"
+
+inherit autotools pkgconfig
+
+
diff --git a/packages/meta/meta-sdk-gpe.bb b/packages/meta/meta-sdk-gpe.bb
index 7b5ac70f48..a91f3192c7 100644
--- a/packages/meta/meta-sdk-gpe.bb
+++ b/packages/meta/meta-sdk-gpe.bb
@@ -26,16 +26,11 @@ TARGET_INSTALL = "\
 
 RDEPENDS = "${TARGET_INSTALL} ${HOST_INSTALL}"
 
-sdk_do_indexes () {
-        set -ex
-        rootfs_ipk_do_indexes
-        sdk_ipk_do_indexes
-        set +ex
-}
-
 do_populate_sdk() {
-        sdk_do_indexes
- 
+	set -ex
+	package_update_index_ipk
+	set +ex
+
 	rm -rf ${SDK_OUTPUT}
 	mkdir -p ${SDK_OUTPUT}
 
diff --git a/packages/meta/meta-sdk-sbox-gpe.bb b/packages/meta/meta-sdk-sbox-gpe.bb
index c9b7737af2..28317c03fe 100644
--- a/packages/meta/meta-sdk-sbox-gpe.bb
+++ b/packages/meta/meta-sdk-sbox-gpe.bb
@@ -29,10 +29,9 @@ RDEPENDS = "${TARGET_INSTALL}"
 IPKG_TARGET = "ipkg-cl -f ${SDK_DIR}/ipkg-target.conf -o ${SDK_OUTPUT}/${prefix}"
 
 do_populate_sdk() {
-
-        set -ex
-        rootfs_ipk_do_indexes
-        set +ex
+	set -ex
+	package_update_index_ipk
+	set +ex
 
 	rm -rf ${SDK_OUTPUT}
 	mkdir -p ${SDK_OUTPUT}
diff --git a/packages/meta/meta-sdk-sbox.bb b/packages/meta/meta-sdk-sbox.bb
index c0cb27d404..13c9612a74 100644
--- a/packages/meta/meta-sdk-sbox.bb
+++ b/packages/meta/meta-sdk-sbox.bb
@@ -25,10 +25,9 @@ RDEPENDS = "${TARGET_INSTALL}"
 IPKG_TARGET = "ipkg-cl -f ${SDK_DIR}/ipkg-target.conf -o ${SDK_OUTPUT}/${prefix}"
 
 do_populate_sdk() {
-
-        set -ex
-        rootfs_ipk_do_indexes
-        set +ex
+	set -ex
+	package_update_index_ipk
+	set +ex
 
 	rm -rf ${SDK_OUTPUT}
 	mkdir -p ${SDK_OUTPUT}
diff --git a/packages/meta/meta-sdk.bb b/packages/meta/meta-sdk.bb
index cc163448ea..47796603db 100644
--- a/packages/meta/meta-sdk.bb
+++ b/packages/meta/meta-sdk.bb
@@ -23,15 +23,11 @@ TARGET_INSTALL = "\
 
 RDEPENDS = "${TARGET_INSTALL} ${HOST_INSTALL}"
 
-sdk_do_indexes () {
-        set -ex
-        rootfs_ipk_do_indexes
-        sdk_ipk_do_indexes
-        set +ex
-}
-
 do_populate_sdk() {
-        sdk_do_indexes
+	set -ex
+	package_update_index_ipk
+	set +ex
+
         echo "Creating host.conf..."
 
 	rm -rf ${SDK_OUTPUT}