11 files changed, 39 insertions, 21 deletions
diff --git a/packages/openmoko2/libmokojournal2_svn.bb b/packages/openmoko2/libmokojournal2_svn.bb
index 6e5383af83..09e249ff4f 100644
--- a/packages/openmoko2/libmokojournal2_svn.bb
+++ b/packages/openmoko2/libmokojournal2_svn.bb
@@ -5,6 +5,10 @@ PR = "r2"
 
 inherit openmoko2 lib_package
 
+do_configure_prepend() {
+        touch gtk-doc.make
+}
+
 do_stage() {
         autotools_stage_all
 }
diff --git a/packages/openmoko2/neod_svn.bb b/packages/openmoko2/neod_svn.bb
index 6e6c3b6019..f68d2e4919 100644
--- a/packages/openmoko2/neod_svn.bb
+++ b/packages/openmoko2/neod_svn.bb
@@ -1,8 +1,9 @@
 DESCRIPTION = "Simple Neo1973 Daemon for Button Handling and Power Management"
 SECTION = "openmoko/daemons"
-DEPENDS = "gconf gtk+ pulseaudio"
+DEPENDS = "gtk+ pulseaudio"
+RDEPENDS = "gpe-scap xrandr alsa-utils-amixer apm"
 PV = "0.1.0+svn${SVNREV}"
-PR = "r1"
+PR = "r4"
 
 inherit openmoko2 gconf
 
diff --git a/packages/openmoko2/openmoko-appmanager2_svn.bb b/packages/openmoko2/openmoko-appmanager2_svn.bb
new file mode 100644
index 0000000000..24b21c668b
--- /dev/null
+++ b/packages/openmoko2/openmoko-appmanager2_svn.bb
@@ -0,0 +1,10 @@
+DESCRIPTION = "The OpenMoko Application Manager"
+SECTION = "openmoko/applications"
+DEPENDS = "libmokoui2 libmokojournal2 startup-notification dbus-glib libice libsm ipkg"
+PV = "0.1.0+svn${SVNREV}"
+PR = "r0"
+
+inherit openmoko2 
+
+FILES_${PN} += "/usr/share/openmoko-appmanager"
+
diff --git a/packages/openmoko2/openmoko-common2_svn.bb b/packages/openmoko2/openmoko-common2_svn.bb
index 0cf7f763cb..018f9a8e74 100644
--- a/packages/openmoko2/openmoko-common2_svn.bb
+++ b/packages/openmoko2/openmoko-common2_svn.bb
@@ -1,21 +1,19 @@
 DESCRIPTION = "Common files for the OpenMoko distribution"
 SECTION = "openmoko/base"
 PV = "0.0+svnr${SRCREV}"
-PR = "r3"
+PR = "r5"
 
 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
-	install -d ${D}${datadir}
-	for i in ${dirs}; do
-		cp -fpPR ${S}/$i ${D}${datadir}
-	done
+	:
 }
 
 PACKAGE_ARCH = "all"
diff --git a/packages/openmoko2/openmoko-dates2_svn.bb b/packages/openmoko2/openmoko-dates2_svn.bb
index 9650a20b0d..14a71d423a 100644
--- a/packages/openmoko2/openmoko-dates2_svn.bb
+++ b/packages/openmoko2/openmoko-dates2_svn.bb
@@ -10,3 +10,8 @@ SRC_URI = "svn://svn.o-hand.com/repos/dates/branches;module=jana;proto=http"
 S = "${WORKDIR}/jana/"
 
 EXTRA_OECONF = "--with-frontend=openmoko"
+
+do_configure_prepend() {
+	touch gtk-doc.make
+}
+
diff --git a/packages/openmoko2/openmoko-mediaplayer2_svn.bb b/packages/openmoko2/openmoko-mediaplayer2_svn.bb
index e353bcbaa7..42a71b1472 100644
--- a/packages/openmoko2/openmoko-mediaplayer2_svn.bb
+++ b/packages/openmoko2/openmoko-mediaplayer2_svn.bb
@@ -1,9 +1,9 @@
 DESCRIPTION = "A media player for OpenMoko"
 SECTION = "openmoko/tools"
-DEPENDS = "libmokoui2 expat gstreamer libspiff"
+DEPENDS = "libmokoui2 expat gstreamer libspiff curl"
 RDEPENDS = "gst-meta-audio"
 PV = "0.1.0+svn${SVNREV}"
-PR = "r1"
+PR = "r2"
 
 inherit openmoko2
 
diff --git a/packages/openmoko2/openmoko-session2.bb b/packages/openmoko2/openmoko-session2.bb
index b1f9dae38d..65cb7f1ca6 100644
--- a/packages/openmoko2/openmoko-session2.bb
+++ b/packages/openmoko2/openmoko-session2.bb
@@ -4,7 +4,7 @@ SECTION = "x11"
 RDEPENDS = "matchbox-common matchbox-applet-startup-monitor matchbox-panel-2"
 RDEPENDS += "openmoko-common2 openmoko-today2 openmoko-dialer2"
 RCONFLICTS = "openmoko-session"
-PR = "r33"
+PR = "r34"
 
 SRC_URI = "file://etc"
 S = ${WORKDIR}
@@ -29,6 +29,9 @@ gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --dire
 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
 
+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"
diff --git a/packages/openmoko2/openmoko-sound-system2/session b/packages/openmoko2/openmoko-sound-system2/session
index dfef83d934..ed2346d55f 100644
--- a/packages/openmoko2/openmoko-sound-system2/session
+++ b/packages/openmoko2/openmoko-sound-system2/session
@@ -22,7 +22,7 @@ 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_openmoko.wav
+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/packages/openmoko2/openmoko-sound-system2_0.1.0.bb b/packages/openmoko2/openmoko-sound-system2_0.1.0.bb
index 35bfe66318..e77561c3a1 100644
--- a/packages/openmoko2/openmoko-sound-system2_0.1.0.bb
+++ b/packages/openmoko2/openmoko-sound-system2_0.1.0.bb
@@ -9,10 +9,11 @@ RDEPENDS = "\
   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 = "r1"
+PR = "r3"
 
 inherit openmoko-base update-rc.d
 
diff --git a/packages/openmoko2/openmoko-sound-theme-standard2_svn.bb b/packages/openmoko2/openmoko-sound-theme-standard2_svn.bb
index 0693b9bb8a..1cfb519c99 100644
--- a/packages/openmoko2/openmoko-sound-theme-standard2_svn.bb
+++ b/packages/openmoko2/openmoko-sound-theme-standard2_svn.bb
@@ -3,7 +3,7 @@ SECTION = "openmoko/base"
 RREPLACES = "openmoko-sound-theme-standard"
 RPROVIDES = "openmoko-sound-theme-standard"
 PV = "0.1+svnr${SRCREV}"
-PR = "r1"
+PR = "r2"
 
 inherit openmoko2 autotools
 
@@ -16,7 +16,7 @@ do_install() {
         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_openmoko.wav; do
+        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
 }
diff --git a/packages/openmoko2/openmoko-theme-standard2_svn.bb b/packages/openmoko2/openmoko-theme-standard2_svn.bb
index b006f6d6dc..ec3b4f702e 100644
--- a/packages/openmoko2/openmoko-theme-standard2_svn.bb
+++ b/packages/openmoko2/openmoko-theme-standard2_svn.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Standard Gtk+ theme for the OpenMoko distribution"
 SECTION = "openmoko/base"
 RCONFLICTS = "openmoko-theme-standard"
 PV = "0.1.0+${SVNREV}"
-PR = "r3"
+PR = "r4"
 
 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}"