openmoko: merge with OE

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4552 311d38ba-8fff-0310-9ca6-ca027cbcb966

41 files changed, 746 insertions, 60 deletions

diff --git a/meta-openmoko/packages/openmoko2/libjana/clockpatch.patch b/meta-openmoko/packages/openmoko2/libjana/clockpatch.patch
new file mode 100644
index 000000000..7b2022223
--- /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 065f38096..48779e50f 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 8e547b366..5625bf809 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 000000000..081311182
--- /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 7d22f27a5..3785074a8 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 000000000..027b3cb22
--- /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 000000000..0ced894a4
--- /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 000000000..19b61ab1f
--- /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 4d6115ae9..000000000
--- 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 000000000..08531e898
--- /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 000000000..a6f5c1117
--- /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 000000000..89f79496a
--- /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 000000000..18e8a88e2
--- /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 000000000..c7f306694
--- /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 000000000..ba202bcec
--- /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 f54a23de1..0ea381437 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 c63738a91..4d7b1bcd7 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 1fa610020..ff3bfa62a 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 000000000..c6f34f413
--- /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 000000000..72c516f5d
--- /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 000000000..596972685
--- /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 b01d9d3c0..fa76c44a1 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 e443e3607..e145fb2d9 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 000000000..79a816332
--- /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 000000000..f28f7f8e0
--- /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 000000000..b944e79b4
--- /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 046f59b3d..d0c3268e0 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 787d9c72b..732cce9d3 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
index 65f1ce72c..65f1ce72c 100644..100755
--- a/meta-openmoko/packages/openmoko2/openmoko-session2/matchbox-session
+++ b/meta-openmoko/packages/openmoko2/openmoko-session2/matchbox-session
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 000000000..964947376
--- /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 000000000..7ba07e978
--- /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 000000000..33cd5648d
--- /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 000000000..3096da481
--- /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 000000000..f9e813a73
--- /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 000000000..f28d1ade9
--- /dev/null
+++ b/meta-openmoko/packages/openmoko2/openmoko-tasks2/openmoko-tasks.png
diff --git a/meta-openmoko/packages/openmoko2/openmoko-tasks2_svn.bb b/meta-openmoko/packages/openmoko2/openmoko-tasks2_svn.bb
index c76ce709b..b18c26981 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 000000000..3a5ef204f
--- /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 bbeba4420..d4d23d11d 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 ecd28d1b6..4b9f245c3 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 6b2d1b6ec..efd281a95 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 000000000..5b3956ee2
--- /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