From 56bd25c1cac0d0b433c3b2b5b4e075319b4aa324 Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <hrw@openedhand.com>
Date: Fri, 23 May 2008 14:10:08 +0000
Subject: [PATCH] openmoko: merge with OE

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4552 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 .../openmoko2/libjana/clockpatch.patch        |  31 +++++
 .../packages/openmoko2/libjana_svn.bb         |   9 +-
 .../packages/openmoko2/libmokogsmd2_svn.bb    |   2 +-
 .../packages/openmoko2/libmokopanelui2_svn.bb |  10 ++
 .../packages/openmoko2/libmokoui2_svn.bb      |   1 +
 .../packages/openmoko2/moko-gtk-engine_svn.bb |  14 +++
 .../packages/openmoko2/neod/htc.patch         |  32 +++++
 .../packages/openmoko2/neod/ipaq.patch        |  32 +++++
 meta-openmoko/packages/openmoko2/neod_svn.bb  |   7 --
 .../openmoko2/openmoko-alsa-scenarios.bb      |  21 ++++
 .../openmoko2/openmoko-appearance_svn.bb      |   8 ++
 .../openmoko-browser2/fingerscroll.diff       |  13 ++
 .../openmoko-browser2/webkit-update.patch     |  99 +++++++++++++++
 .../openmoko2/openmoko-browser2_svn.bb        |  17 +++
 .../openmoko2/openmoko-calculator2_svn.bb     |   7 ++
 .../openmoko2/openmoko-common2_svn.bb         |  14 ++-
 .../openmoko2/openmoko-contacts2_svn.bb       |   8 +-
 .../packages/openmoko2/openmoko-dates2_svn.bb |   4 +-
 .../om-gta01/kernel-2.6.24.patch              |  13 ++
 .../om-gta02/kernel-2.6.24.patch              |  15 +++
 .../openmoko-dialer2/openmoko-dialer.patch    | 117 ++++++++++++++++++
 .../openmoko2/openmoko-dialer2_svn.bb         |  10 +-
 .../openmoko-icon-theme-standard2_svn.bb      |   6 +-
 .../openmoko2/openmoko-mediaplayer2_svn.bb    |  25 ++++
 .../openmoko2/openmoko-messages2_svn.bb       |  11 ++
 .../openmoko2/openmoko-sample2_svn.bb         |  24 ++++
 .../packages/openmoko2/openmoko-session2.bb   |  46 +++++--
 .../openmoko-session2/etc/matchbox/session    |   9 +-
 .../openmoko-session2/matchbox-session        |   0
 .../openmoko-sound-system2/pulseaudio         |  50 ++++++++
 .../openmoko2/openmoko-sound-system2/session  |  28 +++++
 .../openmoko2/openmoko-sound-system2_0.1.0.bb |  34 +++++
 .../openmoko-sound-theme-standard2_svn.bb     |  25 ++++
 .../openmoko-tasks2/openmoko-tasks.desktop    |  12 ++
 .../openmoko-tasks2/openmoko-tasks.png        | Bin 0 -> 14517 bytes
 .../packages/openmoko2/openmoko-tasks2_svn.bb |  17 ++-
 .../openmoko2/openmoko-terminal2_svn.bb       |   8 ++
 .../openmoko2/openmoko-theme-standard2_svn.bb |  12 +-
 .../openmoko2/openmoko-today2-folders_svn.bb  |   5 +-
 .../packages/openmoko2/openmoko-today2_svn.bb |   4 +-
 .../openmoko2/openmoko-worldclock2_svn.bb     |   6 +
 41 files changed, 746 insertions(+), 60 deletions(-)
 create mode 100644 meta-openmoko/packages/openmoko2/libjana/clockpatch.patch
 create mode 100644 meta-openmoko/packages/openmoko2/libmokopanelui2_svn.bb
 create mode 100644 meta-openmoko/packages/openmoko2/moko-gtk-engine_svn.bb
 create mode 100644 meta-openmoko/packages/openmoko2/neod/htc.patch
 create mode 100644 meta-openmoko/packages/openmoko2/neod/ipaq.patch
 delete mode 100644 meta-openmoko/packages/openmoko2/neod_svn.bb
 create mode 100644 meta-openmoko/packages/openmoko2/openmoko-alsa-scenarios.bb
 create mode 100644 meta-openmoko/packages/openmoko2/openmoko-appearance_svn.bb
 create mode 100644 meta-openmoko/packages/openmoko2/openmoko-browser2/fingerscroll.diff
 create mode 100644 meta-openmoko/packages/openmoko2/openmoko-browser2/webkit-update.patch
 create mode 100644 meta-openmoko/packages/openmoko2/openmoko-browser2_svn.bb
 create mode 100644 meta-openmoko/packages/openmoko2/openmoko-calculator2_svn.bb
 create mode 100644 meta-openmoko/packages/openmoko2/openmoko-dialer2/om-gta01/kernel-2.6.24.patch
 create mode 100644 meta-openmoko/packages/openmoko2/openmoko-dialer2/om-gta02/kernel-2.6.24.patch
 create mode 100644 meta-openmoko/packages/openmoko2/openmoko-dialer2/openmoko-dialer.patch
 create mode 100644 meta-openmoko/packages/openmoko2/openmoko-mediaplayer2_svn.bb
 create mode 100644 meta-openmoko/packages/openmoko2/openmoko-messages2_svn.bb
 create mode 100644 meta-openmoko/packages/openmoko2/openmoko-sample2_svn.bb
 mode change 100644 => 100755 meta-openmoko/packages/openmoko2/openmoko-session2/matchbox-session
 create mode 100755 meta-openmoko/packages/openmoko2/openmoko-sound-system2/pulseaudio
 create mode 100644 meta-openmoko/packages/openmoko2/openmoko-sound-system2/session
 create mode 100644 meta-openmoko/packages/openmoko2/openmoko-sound-system2_0.1.0.bb
 create mode 100644 meta-openmoko/packages/openmoko2/openmoko-sound-theme-standard2_svn.bb
 create mode 100644 meta-openmoko/packages/openmoko2/openmoko-tasks2/openmoko-tasks.desktop
 create mode 100644 meta-openmoko/packages/openmoko2/openmoko-tasks2/openmoko-tasks.png
 create mode 100644 meta-openmoko/packages/openmoko2/openmoko-terminal2_svn.bb
 create mode 100644 meta-openmoko/packages/openmoko2/openmoko-worldclock2_svn.bb

diff --git a/meta-openmoko/packages/openmoko2/libjana/clockpatch.patch b/meta-openmoko/packages/openmoko2/libjana/clockpatch.patch
new file mode 100644
index 0000000000..7b20222239
--- /dev/null
+++ b/meta-openmoko/packages/openmoko2/libjana/clockpatch.patch
@@ -0,0 +1,31 @@
+Index: jana/libjana-gtk/jana-gtk-clock.c
+===================================================================
+--- jana.orig/libjana-gtk/jana-gtk-clock.c
++++ jana/libjana-gtk/jana-gtk-clock.c
+@@ -695,7 +695,7 @@ draw_digital_clock (JanaGtkClock *clock,
+ 	cairo_fill (cr);
+ 
+ 	/* Draw dark outline frame */
+-	thickness = width/20;
++	thickness = width/40;
+ 	cairo_new_path (cr);
+ 	cairo_rectangle (cr, thickness/2, thickness/2,
+ 		width - thickness, height - thickness);
+@@ -703,7 +703,7 @@ draw_digital_clock (JanaGtkClock *clock,
+ 	cairo_set_source_rgb (cr, base_color[0]/2,
+ 		base_color[1]/2, base_color[2]/2);
+ 	cairo_stroke (cr);
+-	
++#if 0	
+ 	/* Draw main outline frame */
+ 	cairo_new_path (cr);
+ 	cairo_rectangle (cr, thickness, thickness,
+@@ -728,7 +728,7 @@ draw_digital_clock (JanaGtkClock *clock,
+ 		base_color[1]/1.5, base_color[2]/1.5);
+ 	cairo_set_line_width (cr, thickness/2);
+ 	cairo_stroke (cr);
+-	
++#endif	
+ 	cairo_identity_matrix (cr);
+ }
+ 
diff --git a/meta-openmoko/packages/openmoko2/libjana_svn.bb b/meta-openmoko/packages/openmoko2/libjana_svn.bb
index 065f380969..48779e50fe 100644
--- a/meta-openmoko/packages/openmoko2/libjana_svn.bb
+++ b/meta-openmoko/packages/openmoko2/libjana_svn.bb
@@ -1,13 +1,15 @@
 DESCRIPTION = "O-Hand Jana Library"
 DEPENDS = "libmokojournal2 gtk+ eds-dbus gconf" 
 PV = "0.1.0+svnr${SRCREV}"
-PR = "r4"
+PR = "r5"
 
 inherit autotools pkgconfig lib_package
 
 SRC_URI = "svn://svn.o-hand.com/repos/jana/;module=trunk;proto=http"
 S = "${WORKDIR}/trunk/"
 
+EXTRA_OECONF = "--enable-examples "
+
 do_configure_prepend() {
 	touch gtk-doc.make
 }
@@ -23,6 +25,7 @@ PACKAGES =+ "libjana-ecal libjana-ecal-dbg \
 LEAD_SONAME = "libjana.so"
 
 FILES_libjana-ecal = "${libdir}/libjana-ecal.so.*"
-FILES_libjana-ecal-dbg = "${libdir}/.debug/libjana-ecal*"
+FILES_libjana-ecal-dbg += "${libdir}/.debug/libjana-ecal*"
 FILES_libjana-gtk = "${libdir}/libjana-gtk.so.* ${datadir}/jana/landwater.vmf"
-FILES_libjana-gtk-dbg = "${libdir}/.debug/libjana-gtk.so.*"
+FILES_libjana-gtk-dbg += "${libdir}/.debug/libjana-gtk.so.*"
+FILES_libjana-bin_append = " ${datadir}/jana/flag-uk.png "
diff --git a/meta-openmoko/packages/openmoko2/libmokogsmd2_svn.bb b/meta-openmoko/packages/openmoko2/libmokogsmd2_svn.bb
index 8e547b3663..5625bf809d 100644
--- a/meta-openmoko/packages/openmoko2/libmokogsmd2_svn.bb
+++ b/meta-openmoko/packages/openmoko2/libmokogsmd2_svn.bb
@@ -1,7 +1,7 @@
 SECTION = "openmoko/libs"
 DEPENDS = "libgsmd glib-2.0"
 PV = "0.1.0+svnr${SRCREV}"
-PR = "r1"
+PR = "r2"
 
 inherit openmoko2
 
diff --git a/meta-openmoko/packages/openmoko2/libmokopanelui2_svn.bb b/meta-openmoko/packages/openmoko2/libmokopanelui2_svn.bb
new file mode 100644
index 0000000000..0813111821
--- /dev/null
+++ b/meta-openmoko/packages/openmoko2/libmokopanelui2_svn.bb
@@ -0,0 +1,10 @@
+SECTION = "openmoko/libs"
+DEPENDS = "gtk+ matchbox-panel-2"
+PV = "0.3.0+svnr${SRCREV}"
+PR = "r0"
+
+inherit openmoko2
+
+do_stage() {
+        autotools_stage_all
+}
diff --git a/meta-openmoko/packages/openmoko2/libmokoui2_svn.bb b/meta-openmoko/packages/openmoko2/libmokoui2_svn.bb
index 7d22f27a58..3785074a82 100644
--- a/meta-openmoko/packages/openmoko2/libmokoui2_svn.bb
+++ b/meta-openmoko/packages/openmoko2/libmokoui2_svn.bb
@@ -12,3 +12,4 @@ do_configure_prepend() {
 do_stage() {
         autotools_stage_all
 }
+
diff --git a/meta-openmoko/packages/openmoko2/moko-gtk-engine_svn.bb b/meta-openmoko/packages/openmoko2/moko-gtk-engine_svn.bb
new file mode 100644
index 0000000000..027b3cb22b
--- /dev/null
+++ b/meta-openmoko/packages/openmoko2/moko-gtk-engine_svn.bb
@@ -0,0 +1,14 @@
+DESCRIPTION = "Moko GTK+ theme engine"
+SECTION = "openmoko/libs"
+PV = "0.1.0+svnr${SRCREV}"
+PR = "r0"
+
+inherit openmoko2
+
+PACKAGES += "moko-gtk-theme"
+FILES_${PN} = "${libdir}/gtk-2.0/*/engines/*.so "
+FILES_${PN}-dev = "${libdir}/gtk-2.0/*/engines/*"
+FILES_${PN}-dbg += "${libdir}/gtk-2.0/*/engines/.debug"
+FILES_moko-gtk-theme = "${datadir}/themes"
+RDEPENDS_${PN} = "moko-gtk-theme"
+
diff --git a/meta-openmoko/packages/openmoko2/neod/htc.patch b/meta-openmoko/packages/openmoko2/neod/htc.patch
new file mode 100644
index 0000000000..0ced894a45
--- /dev/null
+++ b/meta-openmoko/packages/openmoko2/neod/htc.patch
@@ -0,0 +1,32 @@
+Index: neod/configure.ac
+===================================================================
+--- neod.orig/configure.ac	2007-09-15 23:01:30.000000000 +0200
++++ neod/configure.ac	2007-09-15 23:02:01.000000000 +0200
+@@ -32,6 +32,10 @@
+         NEOD_CFLAGS="$NEOD_CFLAGS -DNEOD_PLATFORM_MOTOROLA_EZX"
+ fi
+ 
++if test x"$neod_platform" = x"htc"; then
++	NEOD_CFLAGS="$NEOD_CFLAGS -DNEOD_PLATFORM_HTC"
++fi
++
+ CFLAGS=$NEOD_CFLAGS
+ 
+ AC_OUTPUT([
+Index: neod/src/buttonactions.c
+===================================================================
+--- neod.orig/src/buttonactions.c	2007-09-15 23:02:15.000000000 +0200
++++ neod/src/buttonactions.c	2007-09-15 23:04:16.000000000 +0200
+@@ -63,6 +63,12 @@
+     #define TOUCHSCREEN_BUTTON_KEYCODE 0x14a
+ #endif
+ 
++#ifdef NEOD_PLATFORM_HTC
++    #define AUX_BUTTON_KEYCODE 0xd4   /* camera */
++    #define POWER_BUTTON_KEYCODE 0x74 /* power */
++    #define TOUCHSCREEN_BUTTON_KEYCODE 0x14a
++#endif
++
+ #define HEADPHONE_INSERTION_SWITCHCODE 0x02
+ 
+ GPollFD input_fd[10];
diff --git a/meta-openmoko/packages/openmoko2/neod/ipaq.patch b/meta-openmoko/packages/openmoko2/neod/ipaq.patch
new file mode 100644
index 0000000000..19b61ab1f5
--- /dev/null
+++ b/meta-openmoko/packages/openmoko2/neod/ipaq.patch
@@ -0,0 +1,32 @@
+Index: neod/src/buttonactions.c
+===================================================================
+--- neod.orig/src/buttonactions.c	2007-09-29 17:24:43.000000000 +0200
++++ neod/src/buttonactions.c	2007-09-29 17:24:49.000000000 +0200
+@@ -69,6 +69,12 @@
+     #define TOUCHSCREEN_BUTTON_KEYCODE 0x14a
+ #endif
+ 
++#ifdef NEOD_PLATFORM_IPAQ
++    #define AUX_BUTTON_KEYCODE 89   /* _KEY_RECORD */
++    #define POWER_BUTTON_KEYCODE 0x74 /* KEY_POWER */
++    #define TOUCHSCREEN_BUTTON_KEYCODE 0x14a
++#endif
++
+ #define HEADPHONE_INSERTION_SWITCHCODE 0x02
+ 
+ GPollFD input_fd[10];
+Index: neod/configure.ac
+===================================================================
+--- neod.orig/configure.ac	2007-09-29 17:25:12.000000000 +0200
++++ neod/configure.ac	2007-09-29 17:25:48.000000000 +0200
+@@ -36,6 +36,10 @@
+ 	NEOD_CFLAGS="$NEOD_CFLAGS -DNEOD_PLATFORM_HTC"
+ fi
+ 
++if test x"$neod_platform" = x"ipaq"; then
++	NEOD_CFLAGS="$NEOD_CFLAGS -DNEOD_PLATFORM_IPAQ"
++fi
++
+ CFLAGS=$NEOD_CFLAGS
+ 
+ AC_OUTPUT([
diff --git a/meta-openmoko/packages/openmoko2/neod_svn.bb b/meta-openmoko/packages/openmoko2/neod_svn.bb
deleted file mode 100644
index 4d6115ae93..0000000000
--- a/meta-openmoko/packages/openmoko2/neod_svn.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-DESCRIPTION = "Simple Neo1973 Daemon for Button Handling and Power Management"
-SECTION = "openmoko/daemons"
-DEPENDS = "gconf gtk+ pulseaudio"
-PV = "0.1.0+svn${SVNREV}"
-PR = "r0"
-
-inherit openmoko2 gconf
diff --git a/meta-openmoko/packages/openmoko2/openmoko-alsa-scenarios.bb b/meta-openmoko/packages/openmoko2/openmoko-alsa-scenarios.bb
new file mode 100644
index 0000000000..08531e898e
--- /dev/null
+++ b/meta-openmoko/packages/openmoko2/openmoko-alsa-scenarios.bb
@@ -0,0 +1,21 @@
+DESCRIPTION = "Package for the different scenarios used by Openmoko"
+SECTION = "openmoko/base"
+PV = "1.0+svnr${SRCREV}"
+PR = "r1"
+
+COMPATIBLE_MACHINE = "(om-gta01|om-gta02)"
+
+SRC_URI_${MACHINE_ARCH} = "svn://svn.openmoko.org/trunk/src/target/audio/;module=${MACHINE_ARCH};proto=http"
+
+S = "${WORKDIR}/${MACHINE_ARCH}"
+
+do_install() {
+    install -d ${D}${datadir}/openmoko/scenarios/
+    install -m 644 ${S}/*.state ${D}${datadir}/openmoko/scenarios/
+    install -d ${D}${sysconfdir}/
+    install -m 644 ${S}/stereoout.state ${D}${sysconfdir}/asound.state
+}
+
+PACKAGE_ARCH_${PN} = "${MACHINE_ARCH}"
+
+FILES_${PN} += "${datadir}/openmoko"
diff --git a/meta-openmoko/packages/openmoko2/openmoko-appearance_svn.bb b/meta-openmoko/packages/openmoko2/openmoko-appearance_svn.bb
new file mode 100644
index 0000000000..a6f5c11171
--- /dev/null
+++ b/meta-openmoko/packages/openmoko2/openmoko-appearance_svn.bb
@@ -0,0 +1,8 @@
+DESCRIPTION = "The Openmoko Appearance Editor"
+SECTION = "openmoko/pim"
+DEPENDS = "libmokoui2 gconf gtk+"
+RDEPENDS = "libedata-cal openmoko-today2-folders"
+PV = "0.1.0+svnr${SRCREV}"
+PR = "r0"
+
+inherit openmoko2 gtk-icon-cache 
diff --git a/meta-openmoko/packages/openmoko2/openmoko-browser2/fingerscroll.diff b/meta-openmoko/packages/openmoko2/openmoko-browser2/fingerscroll.diff
new file mode 100644
index 0000000000..89f79496a0
--- /dev/null
+++ b/meta-openmoko/packages/openmoko2/openmoko-browser2/fingerscroll.diff
@@ -0,0 +1,13 @@
+Index: src/current-page.c
+===================================================================
+--- openmoko-browser2/src/current-page.c	(revision 3249)
++++ openmoko-browser2/src/current-page.c	(working copy)
+@@ -129,7 +129,7 @@
+     gtk_toolbar_insert (GTK_TOOLBAR (toolbar), data->currentClose, 8);
+ 
+ 
+-    data->currentFingerScroll = gtk_scrolled_window_new (NULL, NULL); //moko_finger_scroll_new ();
++    data->currentFingerScroll = moko_finger_scroll_new ();
+     gtk_box_pack_start (box, data->currentFingerScroll, TRUE, TRUE, 0);
+ }
+ 
diff --git a/meta-openmoko/packages/openmoko2/openmoko-browser2/webkit-update.patch b/meta-openmoko/packages/openmoko2/openmoko-browser2/webkit-update.patch
new file mode 100644
index 0000000000..18e8a88e25
--- /dev/null
+++ b/meta-openmoko/packages/openmoko2/openmoko-browser2/webkit-update.patch
@@ -0,0 +1,99 @@
+diff -Nurd openmoko-browser2.orig/configure.ac openmoko-browser2/configure.ac
+--- openmoko-browser2.orig/configure.ac	2007-10-02 09:00:38.000000000 +0200
++++ openmoko-browser2/configure.ac	2008-03-05 12:12:32.954623867 +0100
+@@ -40,7 +40,7 @@
+ # base deps
+ PKG_CHECK_MODULES(OPENMOKO,  libmokoui2    >= 0.1.0)
+ PKG_CHECK_MODULES(GTHREAD,   gthread-2.0           )
+-PKG_CHECK_MODULES(WEBKITGTK, WebKitGtk)
++PKG_CHECK_MODULES(WEBKITGTK, webkit-1.0)
+ 
+ # glib-genmarshal
+ GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0`
+diff -Nurd openmoko-browser2.orig/src/browser-data.h openmoko-browser2/src/browser-data.h
+--- openmoko-browser2.orig/src/browser-data.h	2007-12-12 20:31:07.000000000 +0100
++++ openmoko-browser2/src/browser-data.h	2008-03-05 12:12:50.497959252 +0100
+@@ -27,7 +27,7 @@
+ #ifndef OPENMOKO_BROWSER_DATA_H
+ #define OPENMOKO_BROWSER_DATA_H
+ 
+-#include "webkitwebview.h"
++#include <webkit/webkitwebview.h>
+ 
+ #include <glib.h>
+ #include <gtk/gtk.h>
+diff -Nurd openmoko-browser2.orig/src/current-page.c openmoko-browser2/src/current-page.c
+--- openmoko-browser2.orig/src/current-page.c	2007-12-12 20:31:07.000000000 +0100
++++ openmoko-browser2/src/current-page.c	2008-03-05 12:13:56.032884030 +0100
+@@ -28,8 +28,8 @@
+ #include "current-page.h"
+ 
+ #include <moko-finger-scroll.h>
+-#include <webkitwebframe.h>
+-#include <webkitwebview.h>
++#include <webkit/webkitwebframe.h>
++#include <webkit/webkitwebview.h>
+ 
+ /*
+  * From a list of BrowserPage's in BrowserData::currentPage show
+@@ -42,7 +42,7 @@
+ static void current_back_clicked_closure(GtkWidget* button, struct BrowserData* data)
+ {
+     g_return_if_fail (data->currentPage);
+-    webkit_web_view_go_backward(data->currentPage->webKitPage);
++    webkit_web_view_go_back(data->currentPage->webKitPage);
+ }
+ 
+ static void current_forward_clicked_closure(GtkWidget* button, struct BrowserData* data)
+@@ -66,7 +66,7 @@
+     g_assert (page == data->currentPage->webKitPage);
+ 
+     if (prog == 100) {
+-        gtk_widget_set_sensitive (GTK_WIDGET (data->currentBack), webkit_web_view_can_go_backward (page));
++        gtk_widget_set_sensitive (GTK_WIDGET (data->currentBack), webkit_web_view_can_go_back (page));
+         gtk_widget_set_sensitive (GTK_WIDGET (data->currentForward), webkit_web_view_can_go_forward (page));
+         gtk_widget_set_sensitive (GTK_WIDGET (data->currentAdd), webkit_web_frame_get_title (webkit_web_view_get_main_frame (page)) != NULL);
+     }
+@@ -176,7 +176,7 @@
+      * Update the GtkToolItems
+      */
+     /* XXX ### FIXME TODO check if we should show stop/reload */
+-    gtk_widget_set_sensitive (GTK_WIDGET (data->currentBack), webkit_web_view_can_go_backward (data->currentPage->webKitPage));
++    gtk_widget_set_sensitive (GTK_WIDGET (data->currentBack), webkit_web_view_can_go_back (data->currentPage->webKitPage));
+     gtk_widget_set_sensitive (GTK_WIDGET (data->currentForward), webkit_web_view_can_go_forward (data->currentPage->webKitPage));
+     gtk_widget_set_sensitive (GTK_WIDGET (data->currentAdd), webkit_web_frame_get_title (webkit_web_view_get_main_frame (data->currentPage->webKitPage)) != NULL);
+     gtk_widget_set_sensitive (GTK_WIDGET (data->currentClose), TRUE);
+diff -Nurd openmoko-browser2.orig/src/main.c openmoko-browser2/src/main.c
+--- openmoko-browser2.orig/src/main.c	2007-12-12 20:31:07.000000000 +0100
++++ openmoko-browser2/src/main.c	2008-03-05 12:14:46.337942098 +0100
+@@ -33,7 +33,7 @@
+ #include <gtk/gtk.h>
+ #include <glib/gi18n.h>
+ 
+-#include <webkit.h>
++#include <webkit/webkit.h>
+ 
+ #include <moko-finger-scroll.h>
+ #include <moko-stock.h>
+@@ -55,7 +55,6 @@
+     gdk_threads_init ();
+     gdk_threads_enter ();
+     gtk_init (&argc, &argv);
+-    webkit_init ();
+     moko_stock_register ();
+     g_set_application_name (_("Browser"));
+ 
+diff -Nurd openmoko-browser2.orig/src/open-pages-page.c openmoko-browser2/src/open-pages-page.c
+--- openmoko-browser2.orig/src/open-pages-page.c	2007-12-12 20:31:07.000000000 +0100
++++ openmoko-browser2/src/open-pages-page.c	2008-03-05 12:13:37.671282983 +0100
+@@ -28,8 +28,8 @@
+ #include "open-pages-page.h"
+ #include "current-page.h"
+ 
+-#include <webkitwebframe.h>
+-#include <webkitwebview.h>
++#include <webkit/webkitwebframe.h>
++#include <webkit/webkitwebview.h>
+ #include <moko-finger-scroll.h>
+ 
+ #include <glib/gi18n.h>
diff --git a/meta-openmoko/packages/openmoko2/openmoko-browser2_svn.bb b/meta-openmoko/packages/openmoko2/openmoko-browser2_svn.bb
new file mode 100644
index 0000000000..c7f3066946
--- /dev/null
+++ b/meta-openmoko/packages/openmoko2/openmoko-browser2_svn.bb
@@ -0,0 +1,17 @@
+DESCRIPTION = "The Openmoko Webbrowser"
+SECTION = "openmoko/apps"
+DEPENDS += "intltool libmokoui2 check webkit-gtk"
+PV = "0.0.1+svnr${SRCREV}"
+PR = "r2"
+
+inherit openmoko2
+LDFLAGS_append = " -Wl,-rpath-link,${CROSS_DIR}/${TARGET_SYS}/lib"
+
+SRC_URI += "file://webkit-update.patch;patch=1;minrev=3646;maxrev=4171"
+
+#SRC_URI += "file://fingerscroll.diff;patch=1"
+
+do_compile_prepend() {
+        find ${S} -name Makefile | xargs sed -i s:'-I/usr/include':"-I${STAGING_INCDIR}":g
+}
+
diff --git a/meta-openmoko/packages/openmoko2/openmoko-calculator2_svn.bb b/meta-openmoko/packages/openmoko2/openmoko-calculator2_svn.bb
new file mode 100644
index 0000000000..ba202bcec9
--- /dev/null
+++ b/meta-openmoko/packages/openmoko2/openmoko-calculator2_svn.bb
@@ -0,0 +1,7 @@
+DESCRIPTION = "A Calculator for Openmoko"
+SECTION = "openmoko/tools"
+DEPENDS = "libmokoui2"
+PV = "0.1.0+svnr${SRCREV}"
+PR = "r0"
+
+inherit openmoko2
diff --git a/meta-openmoko/packages/openmoko2/openmoko-common2_svn.bb b/meta-openmoko/packages/openmoko2/openmoko-common2_svn.bb
index f54a23de18..0ea381437c 100644
--- a/meta-openmoko/packages/openmoko2/openmoko-common2_svn.bb
+++ b/meta-openmoko/packages/openmoko2/openmoko-common2_svn.bb
@@ -1,21 +1,25 @@
-DESCRIPTION = "Common files for the OpenMoko distribution"
+DESCRIPTION = "Common files for the Openmoko framework"
 SECTION = "openmoko/base"
-PV = "0.0+svn${SRCDATE}"
-PR = "r3"
+PV = "0.1.0+svnr${SRCREV}"
+PR = "r0"
 
 inherit openmoko2
 
 SRC_URI = "${OPENMOKO_MIRROR}/src/target/${OPENMOKO_RELEASE}/artwork;module=pixmaps;proto=http"
 S = "${WORKDIR}"
 
+ALLOW_EMPTY = "1"
+
 dirs = "pixmaps"
 
 do_install() {
-	find ${WORKDIR} -name ".svn" | xargs rm -rf
+	find . -name .svn | xargs rm -rf
 	install -d ${D}${datadir}
 	for i in ${dirs}; do
-		cp -fpPR ${S}/$i ${D}${datadir}
+		cp -fR $i ${D}${datadir}/$i;
 	done
+	# moved to xserver-kdrive-common
+	rm -f ${D}${datadir}/pixmaps/xsplash*
 }
 
 PACKAGE_ARCH = "all"
diff --git a/meta-openmoko/packages/openmoko2/openmoko-contacts2_svn.bb b/meta-openmoko/packages/openmoko2/openmoko-contacts2_svn.bb
index c63738a912..4d7b1bcd7d 100644
--- a/meta-openmoko/packages/openmoko2/openmoko-contacts2_svn.bb
+++ b/meta-openmoko/packages/openmoko2/openmoko-contacts2_svn.bb
@@ -1,9 +1,9 @@
-DESCRIPTION = "The OpenMoko Address Book"
+DESCRIPTION = "The Openmoko Address Book"
 SECTION = "openmoko/pim"
-DEPENDS = "libmokoui2 libmokojournal2 dbus-glib"
+DEPENDS = "libmokoui2 libmokojournal2 dbus-glib libjana"
 RDEPENDS = "libedata-book"
-PV = "0.1.0+svn${SVNREV}"
-PR = "r4"
+PV = "0.1.0+svnr${SRCREV}"
+PR = "r5"
 
 inherit openmoko2
 
diff --git a/meta-openmoko/packages/openmoko2/openmoko-dates2_svn.bb b/meta-openmoko/packages/openmoko2/openmoko-dates2_svn.bb
index 1fa610020d..ff3bfa62a6 100644
--- a/meta-openmoko/packages/openmoko2/openmoko-dates2_svn.bb
+++ b/meta-openmoko/packages/openmoko2/openmoko-dates2_svn.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "The OpenMoko Calendar"
+DESCRIPTION = "The Openmoko Calendar"
 SECTION = "openmoko/pim"
 DEPENDS = "libmokoui2 libmokojournal2 gtk+ libglade eds-dbus libjana"
 RDEPENDS = "libedata-cal"
@@ -15,3 +15,5 @@ EXTRA_OECONF = "--with-frontend=openmoko"
 do_configure_prepend() {
 	touch gtk-doc.make
 }
+
+
diff --git a/meta-openmoko/packages/openmoko2/openmoko-dialer2/om-gta01/kernel-2.6.24.patch b/meta-openmoko/packages/openmoko2/openmoko-dialer2/om-gta01/kernel-2.6.24.patch
new file mode 100644
index 0000000000..c6f34f4131
--- /dev/null
+++ b/meta-openmoko/packages/openmoko2/openmoko-dialer2/om-gta01/kernel-2.6.24.patch
@@ -0,0 +1,13 @@
+Index: openmoko-dialer2/src/phone-kit/moko-notify.c
+===================================================================
+--- openmoko-dialer2/src/phone-kit/moko-notify.c.orig	2008-02-14 17:47:23.000000000 +0800
++++ openmoko-dialer2/src/phone-kit/moko-notify.c	2008-02-14 17:48:19.000000000 +0800
+@@ -38,7 +38,7 @@
+ 
+ #define DEFAULT_RINGTONE "/default_ringtone.ogg"
+ #define SYS_BRIGHTNESS "/sys/class/backlight/gta01-bl"
+-#define SYS_VIBRATE "/sys/class/leds/gta01:vibrator"
++#define SYS_VIBRATE "/sys/class/leds/neo1973:vibrator"
+ 
+ struct _MokoNotifyPrivate
+ {
diff --git a/meta-openmoko/packages/openmoko2/openmoko-dialer2/om-gta02/kernel-2.6.24.patch b/meta-openmoko/packages/openmoko2/openmoko-dialer2/om-gta02/kernel-2.6.24.patch
new file mode 100644
index 0000000000..72c516f5d6
--- /dev/null
+++ b/meta-openmoko/packages/openmoko2/openmoko-dialer2/om-gta02/kernel-2.6.24.patch
@@ -0,0 +1,15 @@
+Index: openmoko-dialer2/src/phone-kit/moko-notify.c
+===================================================================
+--- openmoko-dialer2/src/phone-kit/moko-notify.c	(revision 4051)
++++ openmoko-dialer2/src/phone-kit/moko-notify.c	(working copy)
+@@ -37,8 +37,8 @@
+         MOKO_TYPE_NOTIFY, MokoNotifyPrivate))
+ 
+ #define DEFAULT_RINGTONE "/default_ringtone.ogg"
+-#define SYS_BRIGHTNESS "/sys/class/backlight/gta01-bl"
+-#define SYS_VIBRATE "/sys/class/leds/gta01:vibrator"
++#define SYS_BRIGHTNESS "/sys/class/backlight/pcf50633-bl"
++#define SYS_VIBRATE "/sys/class/leds/neo1973:vibrator"
+ 
+ struct _MokoNotifyPrivate
+ {
diff --git a/meta-openmoko/packages/openmoko2/openmoko-dialer2/openmoko-dialer.patch b/meta-openmoko/packages/openmoko2/openmoko-dialer2/openmoko-dialer.patch
new file mode 100644
index 0000000000..5969726857
--- /dev/null
+++ b/meta-openmoko/packages/openmoko2/openmoko-dialer2/openmoko-dialer.patch
@@ -0,0 +1,117 @@
+--- openmoko-dialer2/src/moko-dialer.c~	2007-08-27 20:02:37.000000000 +0930
++++ openmoko-dialer2/src/moko-dialer.c	2007-08-27 18:59:37.000000000 +0930
+@@ -69,8 +69,7 @@
+ 
+   /* Registration variables */
+   guint               reg_timeout;
+-  gboolean            reg_request;
+-  gboolean            registered;
++  MokoGsmdConnectionNetregType registered;
+ };
+ 
+ enum
+@@ -292,8 +291,7 @@
+ 
+   moko_keypad_set_pin_mode (MOKO_KEYPAD (priv->keypad), FALSE);
+     
+-  priv->reg_request = TRUE;
+-  priv->registered = FALSE;
++  priv->registered = MOKO_GSMD_CONNECTION_NETREG_NONE;
+   priv->reg_timeout = g_timeout_add (GSM_REGISTER_TIMEOUT, 
+                                      (GSourceFunc)register_network_cb, 
+                                      dialer);
+@@ -424,14 +422,14 @@
+   g_return_if_fail (MOKO_IS_DIALER (dialer));
+   priv = dialer->priv;
+ 
++  g_warning ("on_network_registered: type is %d\n", type);
++
+   switch (type)
+   {
+     case MOKO_GSMD_CONNECTION_NETREG_NONE:
+     case MOKO_GSMD_CONNECTION_NETREG_SEARCHING:
+       /* Do nothing */
+       g_print ("NetReg: Searching for network\n");
+-      g_source_remove (priv->reg_timeout);
+-      priv->registered = TRUE;
+       break;
+     case MOKO_GSMD_CONNECTION_NETREG_DENIED:
+       /* This may be a pin issue*/
+@@ -441,11 +439,12 @@
+       g_print ("NetReg: Network registered\n");
+       g_print("\tLocationAreaCode = %x\n\tCellID = %x\n", lac, cell);
+       g_source_remove (priv->reg_timeout);
+-      priv->registered = TRUE;
+       break;
+     default:
+       g_warning ("Unhandled register event type = %d\n", type);
+    };
++
++  priv->registered = type;
+ }
+ 
+ static void
+@@ -619,28 +618,32 @@
+   g_return_val_if_fail (MOKO_DIALER (dialer), TRUE);
+   priv = MOKO_DIALER_GET_PRIVATE (dialer);
+ 
+-  if (!priv->reg_request)
++  /* We check whether we've been registered yet, otherwise keep poking 
++   * gsmd
++   */
++  switch (priv->registered)
+   {
+-    /* We have yet to request registration, so lets do it */
+-    /* FIXME: do the pin stuff */
+-    g_print ("Requesting registration\n");
+-    moko_gsmd_connection_network_register (priv->connection);
+-  }
+-  else 
+-  {
+-    /* We check whether we've been registered yet, otherwise keep poking 
+-     * gsmd
+-     */
+-    if (priv->registered)
+-    {
+-      g_print ("Network Registered\n");
+-      return FALSE;
+-    }
+-    else
+-    {
++    case MOKO_GSMD_CONNECTION_NETREG_NONE:
++      /* We have yet to request registration, so lets do it */
++      /* FIXME: do the pin stuff */
+       g_print ("Requesting registration\n");
+       moko_gsmd_connection_network_register (priv->connection);
+-    }
++      priv->registered = MOKO_GSMD_CONNECTION_NETREG_SEARCHING;
++      break;
++    case MOKO_GSMD_CONNECTION_NETREG_SEARCHING:
++      g_print ("Waiting for registration\n");
++      break;
++    case MOKO_GSMD_CONNECTION_NETREG_DENIED:
++      g_print ("Registration denied, retrying\n");
++      moko_gsmd_connection_network_register (priv->connection);
++      priv->registered = MOKO_GSMD_CONNECTION_NETREG_SEARCHING;
++      break;
++    case MOKO_GSMD_CONNECTION_NETREG_HOME:
++    case MOKO_GSMD_CONNECTION_NETREG_ROAMING:
++      g_print ("Network Registered\n");
++	return FALSE;
++    default:
++      g_warning ("Unhandled register event type = %d\n", priv->registered);
+   }
+   
+   return TRUE;
+@@ -754,9 +757,8 @@
+ 
+   /* Handle network registration a few seconds after powering up the 
+    * antenna*/ 
+-  priv->reg_request = TRUE;
+-  priv->registered = FALSE;
+-  priv->reg_timeout = g_timeout_add (GSM_REGISTER_TIMEOUT, 
++  priv->registered = MOKO_GSMD_CONNECTION_NETREG_NONE;
++  priv->reg_timeout = g_timeout_add (GSM_REGISTER_TIMEOUT * 2, 
+                                      (GSourceFunc)register_network_cb, 
+                                      dialer);
+   
diff --git a/meta-openmoko/packages/openmoko2/openmoko-dialer2_svn.bb b/meta-openmoko/packages/openmoko2/openmoko-dialer2_svn.bb
index b01d9d3c05..fa76c44a14 100644
--- a/meta-openmoko/packages/openmoko2/openmoko-dialer2_svn.bb
+++ b/meta-openmoko/packages/openmoko2/openmoko-dialer2_svn.bb
@@ -1,11 +1,15 @@
-DESCRIPTION = "The OpenMoko Dialer"
+DESCRIPTION = "The Openmoko Dialer"
 SECTION = "openmoko/pim"
-DEPENDS = "libmokogsmd2 libmokoui2 libmokojournal2 pulseaudio"
+DEPENDS = "libgsmd libjana libmokoui2 libmokojournal2 pulseaudio libnotify"
 PV = "0.1.0+svnr${SRCREV}"
-PR = "r5"
+PR = "r8"
+PE = "1"
 
 inherit openmoko2
 
+SRC_URI_append_om-gta01 = " file://kernel-2.6.24.patch;patch=1"
+SRC_URI_append_om-gta02 = " file://kernel-2.6.24.patch;patch=1"
+
 EXTRA_OECONF = "--with-dbusbindir=${STAGING_BINDIR_NATIVE}"
 
 FILES_${PN} += "${datadir}/openmoko-dialer/ ${datadir}/dbus-1/services/"
diff --git a/meta-openmoko/packages/openmoko2/openmoko-icon-theme-standard2_svn.bb b/meta-openmoko/packages/openmoko2/openmoko-icon-theme-standard2_svn.bb
index e443e36075..e145fb2d98 100644
--- a/meta-openmoko/packages/openmoko2/openmoko-icon-theme-standard2_svn.bb
+++ b/meta-openmoko/packages/openmoko2/openmoko-icon-theme-standard2_svn.bb
@@ -1,7 +1,7 @@
-DESCRIPTION = "Standard Gtk+ icon theme for the OpenMoko distribution"
+DESCRIPTION = "Standard Gtk+ icon theme for the Openmoko framework"
 SECTION = "openmoko/base"
-PV = "0.1.0+svn${SVNREV}"
-PR = "r0"
+PV = "0.1.0+svnr${SRCREV}"
+PR = "r1"
 
 inherit openmoko2
 
diff --git a/meta-openmoko/packages/openmoko2/openmoko-mediaplayer2_svn.bb b/meta-openmoko/packages/openmoko2/openmoko-mediaplayer2_svn.bb
new file mode 100644
index 0000000000..79a8163328
--- /dev/null
+++ b/meta-openmoko/packages/openmoko2/openmoko-mediaplayer2_svn.bb
@@ -0,0 +1,25 @@
+DESCRIPTION = "A media player for Openmoko"
+SECTION = "openmoko/tools"
+DEPENDS = "libmokoui2 expat gstreamer libspiff curl"
+RDEPENDS = "gst-meta-audio gconf openmoko-sound-system2"
+PV = "0.1.0+svnr${SRCREV}"
+PR = "r4"
+
+inherit openmoko2
+
+FILES_${PN} += "${datadir}/openmoko-mediaplayer"
+
+do_install_append() {
+	install -d ${D}${sysconfdir}/gconf/schemas
+	install -m 0644 ${S}/openmoko-mediaplayer.schemas ${D}${sysconfdir}/gconf/schemas/openmoko-mediaplayer.schemas
+}
+
+pkg_postinst_openmoko-mediaplayer2 () {
+#!/bin/sh -e
+if [ "x$D" != "x" ]; then
+    exit 1
+fi
+
+export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+gconftool-2 --makefile-install-rule ${sysconfdir}/gconf/schemas/openmoko-mediaplayer.schemas > /dev/null
+}
diff --git a/meta-openmoko/packages/openmoko2/openmoko-messages2_svn.bb b/meta-openmoko/packages/openmoko2/openmoko-messages2_svn.bb
new file mode 100644
index 0000000000..f28f7f8e0a
--- /dev/null
+++ b/meta-openmoko/packages/openmoko2/openmoko-messages2_svn.bb
@@ -0,0 +1,11 @@
+DESCRIPTION = "The Openmoko Message application"
+SECTION = "openmoko/pim"
+DEPENDS = "libmokogsmd2 libmokoui2 libmokojournal2 libjana"
+PV = "0.1.0+svnr${SRCREV}"
+PR = "r1"
+
+inherit openmoko2
+
+EXTRA_OECONF = "--with-dbusbindir=${STAGING_BINDIR_NATIVE}"
+
+FILES_${PN} += "${datadir}/openmoko-messages/ ${datadir}/dbus-1/services/"
diff --git a/meta-openmoko/packages/openmoko2/openmoko-sample2_svn.bb b/meta-openmoko/packages/openmoko2/openmoko-sample2_svn.bb
new file mode 100644
index 0000000000..b944e79b45
--- /dev/null
+++ b/meta-openmoko/packages/openmoko2/openmoko-sample2_svn.bb
@@ -0,0 +1,24 @@
+DESCRIPTION = "The Openmoko Sample Project"
+SECTION = "openmoko/applications"
+DEPENDS = "libmokoui2 intltool gconf"
+PV = "0.0.1+svnr${SRCREV}"
+PR = "r0"
+
+inherit openmoko2
+
+PACKAGES += "${PN}-src"
+# path should match the toolchain path
+FILES_${PN}-src = "/usr/local/openmoko"
+PACKAGE_ARCH_${PN}-src = "${BUILD_ARCH}-all-sdk"
+
+do_configure_prepend() {
+	install -d ${WORKDIR}/source
+	cp -pPR ${S} ${WORKDIR}/source/
+	find ${WORKDIR}/source -name ".svn"|xargs rm -rf
+}
+
+do_install_append() {
+	install -d ${D}/usr/local/openmoko/source/
+	cp -pPR ${WORKDIR}/source/* ${D}/usr/local/openmoko/source/
+}
+
diff --git a/meta-openmoko/packages/openmoko2/openmoko-session2.bb b/meta-openmoko/packages/openmoko2/openmoko-session2.bb
index 046f59b3d9..d0c3268e0c 100644
--- a/meta-openmoko/packages/openmoko2/openmoko-session2.bb
+++ b/meta-openmoko/packages/openmoko2/openmoko-session2.bb
@@ -1,33 +1,53 @@
-DESCRIPTION = "Custom MB session files for OpenMoko"
+DESCRIPTION = "Custom Matchbox session files for Openmoko"
 LICENSE = "GPL"
 SECTION = "x11"
-RDEPENDS = "matchbox-common matchbox-applet-startup-monitor matchbox-panel-2"
-RDEPENDS += "openmoko-common2 openmoko-today2 openmoko-dialer2"
-RCONFLICTS = "openmoko-session"
-PR = "r29"
+RDEPENDS_${PN} = "matchbox-panel-2 openmoko-common2 openmoko-today2 openmoko-dialer2"
+RCONFLICTS_${PN} = "openmoko-session matchbox-common"
+PR = "r69"
 
-SRC_URI = "file://etc"
-S = ${WORKDIR}
+SRC_URI = "\
+  file://etc \
+  file://matchbox-session \
+"
+
+S = "${WORKDIR}"
+
+inherit update-alternatives
 
 do_install() {
-	cp -R ${S}/etc ${D}/etc
-	rm -fR ${D}/etc/.svn
-	rm -fR ${D}/etc/matchbox/.svn
-	chmod -R 755 ${D}/etc
+        install -d ${D}${bindir}
+        install -m 0655 ${WORKDIR}/matchbox-session ${D}${bindir}
+        install -d ${D}${sysconfdir}
+        cp -R ${S}/etc/* ${D}${sysconfdir}
+        rm -fR ${D}${sysconfdir}/.svn
+        rm -fR ${D}${sysconfdir}/matchbox/.svn
+        chmod -R 755 ${D}${sysconfdir}/
 }
 
+PACKAGE_ARCH = "all"
+
 pkg_postinst_openmoko-session2 () {
 #!/bin/sh -e
 if [ "x$D" != "x" ]; then
     exit 1
 fi
 
-gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type string --set /desktop/poky/interface/theme openmoko-standard-2
+gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type string --set /desktop/poky/interface/theme Moko
 gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type string --set /desktop/poky/interface/icon_theme openmoko-standard
 gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type string --set /desktop/poky/interface/font_name "Sans 5"
+gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type string --set /desktop/poky/interface/wallpaper ${datadir}/pixmaps/wallpaper.png
+gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type bool --set /desktop/poky/interface/digital_clock 1
 gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type int --set /desktop/poky/peripherals/mouse/drag_threshold 8
 gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type int --set /desktop/openmoko/neod/power_management 2
+# gstreamer audio settings
+gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct -t string --set /system/gstreamer/0.10/default/audiosink pulsesink
+gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct -t string --set /system/gstreamer/0.10/default/audiosrc pulsesrc
 
 }
 
-PACKAGE_ARCH = "all"
+ALTERNATIVE_NAME = "x-window-manager"
+ALTERNATIVE_PATH = "${bindir}/matchbox-session"
+ALTERNATIVE_LINK = "${bindir}/x-window-manager"
+ALTERNATIVE_PRIORITY = "11"
+
+CONFFILES_${PN} = "${sysconfdir}/matchbox/session"
diff --git a/meta-openmoko/packages/openmoko2/openmoko-session2/etc/matchbox/session b/meta-openmoko/packages/openmoko2/openmoko-session2/etc/matchbox/session
index 787d9c72ba..732cce9d3f 100755
--- a/meta-openmoko/packages/openmoko2/openmoko-session2/etc/matchbox/session
+++ b/meta-openmoko/packages/openmoko2/openmoko-session2/etc/matchbox/session
@@ -1,11 +1,12 @@
 #!/bin/sh
-
 SHOWCURSOR="no"
 
 openmoko-today &
-openmoko-dialer &
+phone-kit &
 
-matchbox-window-manager -use_titlebar yes -use_desktop_mode decorated -theme openmoko-standard-2 -use_cursor $SHOWCURSOR $@ &
+matchbox-window-manager -use_titlebar yes -use_desktop_mode decorated -theme Moko -use_cursor $SHOWCURSOR $@ &
 
-exec matchbox-panel --start-applets showdesktop --end-applets clock,battery,systray,startup --titlebar
+matchbox-panel-2 --start-applets systray,startup \
+  --end-applets openmoko-panel-battery,openmoko-panel-gsm,openmoko-panel-gps,openmoko-panel-usb,openmoko-panel-bt,openmoko-panel-memory,openmoko-panel-wifi --titlebar &
 
+exec neod
diff --git a/meta-openmoko/packages/openmoko2/openmoko-session2/matchbox-session b/meta-openmoko/packages/openmoko2/openmoko-session2/matchbox-session
old mode 100644
new mode 100755
diff --git a/meta-openmoko/packages/openmoko2/openmoko-sound-system2/pulseaudio b/meta-openmoko/packages/openmoko2/openmoko-sound-system2/pulseaudio
new file mode 100755
index 0000000000..964947376e
--- /dev/null
+++ b/meta-openmoko/packages/openmoko2/openmoko-sound-system2/pulseaudio
@@ -0,0 +1,50 @@
+#!/bin/sh
+#
+# pulseaudio	This shell script starts and stops pulseaudio.
+#
+# chkconfig: 345 90 40
+# description: Pulseaudio manages the sound input/output
+# processname: pulseaudio
+
+# Source function library.
+#. /etc/rc.d/init.d/functions
+
+RETVAL=0
+prog="pulseaudio"
+
+start() {
+    echo -n "Starting audio server: "
+    # FIXME once alsa/shm permissions have been fixed, supply --system
+    start-stop-daemon -S -x /usr/bin/pulseaudio -- --no-cpu-limit --resample-method=trivial -D -nF /etc/pulse/session
+
+    if [ $? = 0 ]; then
+        echo "$prog (warning ignores)." # FIXME remove comment on warning
+    else
+        echo "(failed.)"
+    fi
+}
+
+stop() {
+    echo -n "Stopping audio server: "
+    start-stop-daemon -K -x /usr/bin/pulseaudio
+    echo "pulseaudio."
+}
+
+# See how we were called.
+case "$1" in
+  start)
+	start
+	;;
+  stop)
+	stop
+	;;
+  restart|reload)
+	stop
+	start
+	;;
+  *)
+	echo "Usage: $0 {start|stop|restart}"
+	exit 1
+esac
+
+exit $RETVAL
diff --git a/meta-openmoko/packages/openmoko2/openmoko-sound-system2/session b/meta-openmoko/packages/openmoko2/openmoko-sound-system2/session
new file mode 100644
index 0000000000..7ba07e9784
--- /dev/null
+++ b/meta-openmoko/packages/openmoko2/openmoko-sound-system2/session
@@ -0,0 +1,28 @@
+#!/usr/bin/pulseaudio -nF
+
+# Create autoload entries for the device drivers
+add-autoload-sink output module-alsa-sink sink_name=output
+add-autoload-source input module-alsa-source source_name=input
+
+# Load several protocols
+load-module module-esound-protocol-unix
+load-module module-simple-protocol-tcp
+load-module module-native-protocol-unix
+load-module module-cli-protocol-unix
+
+# Make some devices default
+set-default-sink output
+set-default-source input
+
+# Don't fail if the audio files referred to below don't exist
+.nofail
+
+# Load an audio to the sample cache for usage with module-x11-bell
+load-sample-lazy x11-bell /usr/share/openmoko/sounds/notify_doorbell.wav
+load-module module-x11-bell sample=x11-bell
+
+# Load samples
+load-sample startup /usr/share/openmoko/sounds/startup_unintrusive.wav
+load-sample touchscreen /usr/share/openmoko/sounds/touchscreen_click.wav
+load-sample ringtone /usr/share/openmoko/sounds/ringtone_classy.wav
+
diff --git a/meta-openmoko/packages/openmoko2/openmoko-sound-system2_0.1.0.bb b/meta-openmoko/packages/openmoko2/openmoko-sound-system2_0.1.0.bb
new file mode 100644
index 0000000000..33cd5648d4
--- /dev/null
+++ b/meta-openmoko/packages/openmoko2/openmoko-sound-system2_0.1.0.bb
@@ -0,0 +1,34 @@
+DESCRIPTION = "Openmoko Sound System"
+SECTION = "openmoko/base"
+RDEPENDS = "\
+  pulseaudio-server \
+  pulseaudio-module-alsa-sink \
+  pulseaudio-module-alsa-source \
+  pulseaudio-module-cli \
+  pulseaudio-module-esound-protocol-unix \
+  pulseaudio-module-simple-protocol-tcp \
+  pulseaudio-module-native-protocol-unix \
+  pulseaudio-module-cli-protocol-unix \
+  gst-plugin-pulse \
+"
+RREPLACES = "openmoko-sound-system"
+RPROVIDES = "openmoko-sound-system"
+PR = "r5"
+
+inherit openmoko-base update-rc.d
+
+INITSCRIPT_NAME = "pulseaudio"
+INITSCRIPT_PARAMS = "defaults 35"
+
+SRC_URI = "file://pulseaudio \
+           file://session"
+S = "${WORKDIR}"
+
+do_install() {
+    install -d ${D}/${sysconfdir}/init.d
+    install -m 0755 ${WORKDIR}/pulseaudio ${D}/${sysconfdir}/init.d/
+    install -d ${D}/${sysconfdir}/pulse
+	install -m 0755 ${WORKDIR}/session ${D}/${sysconfdir}/pulse/session
+}
+
+PACKAGE_ARCH = "all"
diff --git a/meta-openmoko/packages/openmoko2/openmoko-sound-theme-standard2_svn.bb b/meta-openmoko/packages/openmoko2/openmoko-sound-theme-standard2_svn.bb
new file mode 100644
index 0000000000..3096da4813
--- /dev/null
+++ b/meta-openmoko/packages/openmoko2/openmoko-sound-theme-standard2_svn.bb
@@ -0,0 +1,25 @@
+DESCRIPTION = "Standard sound theme for the Openmoko framework"
+SECTION = "openmoko/base"
+RREPLACES = "openmoko-sound-theme-standard"
+RPROVIDES = "openmoko-sound-theme-standard"
+PV = "0.1+svnr${SRCREV}"
+PR = "r3"
+
+inherit openmoko2 autotools
+
+SRC_URI = "${OPENMOKO_MIRROR}/src/target/${OPENMOKO_RELEASE}/artwork;module=sounds;proto=http"
+S = "${WORKDIR}/sounds"
+
+do_install() {
+        find ${WORKDIR} -name ".svn" | xargs rm -rf
+        install -d ${D}${datadir}/openmoko/sounds
+        for i in *.mp3; do
+                cp -fpPR ${S}/$i ${D}${datadir}/openmoko/sounds/
+        done
+        for i in touchscreen_click.wav ringtone_classy.wav notify_doorbell.wav startup_unintrusive.wav; do
+                cp -f ${S}/$i ${D}${datadir}/openmoko/sounds/
+        done
+}
+
+FILES_${PN} = "${datadir}"
+
diff --git a/meta-openmoko/packages/openmoko2/openmoko-tasks2/openmoko-tasks.desktop b/meta-openmoko/packages/openmoko2/openmoko-tasks2/openmoko-tasks.desktop
new file mode 100644
index 0000000000..f9e813a734
--- /dev/null
+++ b/meta-openmoko/packages/openmoko2/openmoko-tasks2/openmoko-tasks.desktop
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Tasks
+Comment=What you need to do
+Exec=tasks
+Icon=openmoko-tasks
+Terminal=false
+Type=Application
+Categories=GTK;Application;PIM;Office
+MimeType=text/x-vcard;
+SingleInstance=true
+StartupNotify=true
diff --git a/meta-openmoko/packages/openmoko2/openmoko-tasks2/openmoko-tasks.png b/meta-openmoko/packages/openmoko2/openmoko-tasks2/openmoko-tasks.png
new file mode 100644
index 0000000000000000000000000000000000000000..f28d1ade99101dfccde15114a74449e21275e835
GIT binary patch
literal 14517
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
G1O5lxg&nm3

literal 0
HcmV?d00001

diff --git a/meta-openmoko/packages/openmoko2/openmoko-tasks2_svn.bb b/meta-openmoko/packages/openmoko2/openmoko-tasks2_svn.bb
index c76ce709bb..b18c269814 100644
--- a/meta-openmoko/packages/openmoko2/openmoko-tasks2_svn.bb
+++ b/meta-openmoko/packages/openmoko2/openmoko-tasks2_svn.bb
@@ -1,14 +1,23 @@
-DESCRIPTION = "The OpenMoko Agenda"
+DESCRIPTION = "The Openmoko Agenda"
 SECTION = "openmoko/pim"
 DEPENDS = "dbus-glib eds-dbus libmokoui2"
 RDEPENDS = "libedata-cal"
-RCONFLICTS = "tasks"
-PV = "0.1.0+svn${SVNREV}"
+PV = "0.1.0+svnr${SRCREV}"
 PR = "r1"
 
 inherit openmoko2
 
-SRC_URI = "svn://svn.o-hand.com/repos/tasks/;module=trunk;proto=http"
+SRC_URI = "svn://svn.o-hand.com/repos/tasks/;module=trunk;proto=http \
+           file://openmoko-tasks.desktop \
+           file://openmoko-tasks.png"
 S = "${WORKDIR}/trunk"
 
 EXTRA_OECONF = "--enable-omoko --disable-gtk"
+
+do_install_append() {
+	install -d ${D}${datadir}/applications
+	install -m 0644 ${WORKDIR}/openmoko-tasks.desktop ${D}${datadir}/applications/tasks.desktop
+	install -d ${D}${datadir}/pixmaps
+	install -m 0644 ${WORKDIR}/openmoko-tasks.png ${D}${datadir}/pixmaps
+}
+
diff --git a/meta-openmoko/packages/openmoko2/openmoko-terminal2_svn.bb b/meta-openmoko/packages/openmoko2/openmoko-terminal2_svn.bb
new file mode 100644
index 0000000000..3a5ef204ff
--- /dev/null
+++ b/meta-openmoko/packages/openmoko2/openmoko-terminal2_svn.bb
@@ -0,0 +1,8 @@
+DESCRIPTION = "The Openmoko Command Line Terminal"
+SECTION = "openmoko/applications"
+DEPENDS = "vala-native vte libmokoui2"
+RDEPENDS = "ttf-liberation-mono"
+PV = "3.0.0+svnr${SRCREV}"
+PR = "r1"
+
+inherit openmoko2
diff --git a/meta-openmoko/packages/openmoko2/openmoko-theme-standard2_svn.bb b/meta-openmoko/packages/openmoko2/openmoko-theme-standard2_svn.bb
index bbeba4420f..d4d23d11d6 100644
--- a/meta-openmoko/packages/openmoko2/openmoko-theme-standard2_svn.bb
+++ b/meta-openmoko/packages/openmoko2/openmoko-theme-standard2_svn.bb
@@ -1,8 +1,8 @@
-DESCRIPTION = "Standard Gtk+ theme for the OpenMoko distribution"
+DESCRIPTION = "Standard Gtk+ theme for the Openmoko framework"
 SECTION = "openmoko/base"
 RCONFLICTS = "openmoko-theme-standard"
-PV = "0.1.0+svnr${SRCDATE}"
-PR = "r2"
+PV = "0.1.1+svnr${SRCREV}"
+PR = "r5"
 
 inherit openmoko2
 
@@ -15,11 +15,7 @@ do_install() {
 	cp -fpPR ${S}/* ${D}${datadir}/themes/openmoko-standard-2/
 	rm -rf ${D}${datadir}/themes/openmoko-standard-2/patches/
 	
-	install -d ${D}${sysconfdir}/gtk-2.0
-	echo 'include "${datadir}/themes/openmoko-standard-2/gtk-2.0/gtkrc"' >> ${D}${sysconfdir}/gtk-2.0/gtkrc
 }
 
-CONFFILES_${PN} = "${sysconfdir}/gtk-2.0/gtkrc"
-
 PACKAGE_ARCH = "all"
-FILES_${PN} = "${datadir} ${sysconfdir}"
+FILES_${PN} = "${datadir}"
diff --git a/meta-openmoko/packages/openmoko2/openmoko-today2-folders_svn.bb b/meta-openmoko/packages/openmoko2/openmoko-today2-folders_svn.bb
index ecd28d1b68..4b9f245c3c 100644
--- a/meta-openmoko/packages/openmoko2/openmoko-today2-folders_svn.bb
+++ b/meta-openmoko/packages/openmoko2/openmoko-today2-folders_svn.bb
@@ -1,7 +1,8 @@
-DESCRIPTION = "The OpenMoko Today2 vfolder files"
+DESCRIPTION = "The Openmoko Today2 vfolder files"
 SECTION = "openmoko/misc"
 PV = "0.1.0+svnr${SRCREV}"
-PR = "r1"
+PR = "r3"
+RCONFLICTS_${PN} = "matchbox-common"
 
 inherit openmoko2
 
diff --git a/meta-openmoko/packages/openmoko2/openmoko-today2_svn.bb b/meta-openmoko/packages/openmoko2/openmoko-today2_svn.bb
index 6b2d1b6ec7..efd281a95e 100644
--- a/meta-openmoko/packages/openmoko2/openmoko-today2_svn.bb
+++ b/meta-openmoko/packages/openmoko2/openmoko-today2_svn.bb
@@ -1,6 +1,6 @@
-DESCRIPTION = "The OpenMoko Application Launcher"
+DESCRIPTION = "The Openmoko Application Launcher"
 SECTION = "openmoko/pim"
-DEPENDS = "libmokoui2 libmokojournal2 libjana startup-notification dbus-glib"
+DEPENDS = "libmokoui2 libmokojournal2 libjana startup-notification dbus-glib libice libsm"
 RDEPENDS = "libedata-cal openmoko-today2-folders"
 PV = "0.1.0+svnr${SRCREV}"
 PR = "r2"
diff --git a/meta-openmoko/packages/openmoko2/openmoko-worldclock2_svn.bb b/meta-openmoko/packages/openmoko2/openmoko-worldclock2_svn.bb
new file mode 100644
index 0000000000..5b3956ee23
--- /dev/null
+++ b/meta-openmoko/packages/openmoko2/openmoko-worldclock2_svn.bb
@@ -0,0 +1,6 @@
+DESCRIPTION = "A World-Clock for Openmoko"
+SECTION = "openmoko/tools"
+DEPENDS = "libmokoui2 libjana"
+PV = "0.1.0+svnr${SRCREV}"
+
+inherit openmoko2