merge of '76e1e69496801009ea0aa69c84f76e858978ab99'

     and 'db976a98427dd6a195e2cf167e225de2d0206aea'

22 files changed, 235 insertions, 0 deletions

diff --git a/packages/openmoko2/.mtn2git_empty b/packages/openmoko2/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/openmoko2/.mtn2git_empty
diff --git a/packages/openmoko2/libmokogsmd2_svn.bb b/packages/openmoko2/libmokogsmd2_svn.bb
new file mode 100644
index 0000000000..2551519348
--- /dev/null
+++ b/packages/openmoko2/libmokogsmd2_svn.bb
@@ -0,0 +1,11 @@
+SECTION = "openmoko/libs"
+DEPENDS = "libgsmd glib-2.0"
+PV = "0.1.0+svn${SVNREV}"
+PR = "r1"
+
+inherit openmoko2
+
+do_stage() {
+        autotools_stage_all
+}
+
diff --git a/packages/openmoko2/libmokojournal2_svn.bb b/packages/openmoko2/libmokojournal2_svn.bb
new file mode 100644
index 0000000000..007131659a
--- /dev/null
+++ b/packages/openmoko2/libmokojournal2_svn.bb
@@ -0,0 +1,10 @@
+SECTION = "openmoko/libs"
+DEPENDS = "eds-dbus"
+PV = "0.1.0+svn${SVNREV}"
+PR = "r1"
+
+inherit openmoko2
+
+do_stage() {
+        autotools_stage_all
+}
diff --git a/packages/openmoko2/libmokopanelui2_svn.bb b/packages/openmoko2/libmokopanelui2_svn.bb
new file mode 100644
index 0000000000..bfeb22fd7b
--- /dev/null
+++ b/packages/openmoko2/libmokopanelui2_svn.bb
@@ -0,0 +1,11 @@
+SECTION = "openmoko/libs"
+DEPENDS = "gtk+"
+PV = "0.1.0+svn${SVNREV}"
+PR = "r1" 
+
+inherit openmoko2
+
+do_stage() {
+        autotools_stage_all
+}
+
diff --git a/packages/openmoko2/libmokoui2_svn.bb b/packages/openmoko2/libmokoui2_svn.bb
new file mode 100644
index 0000000000..86372ae274
--- /dev/null
+++ b/packages/openmoko2/libmokoui2_svn.bb
@@ -0,0 +1,14 @@
+SECTION = "openmoko/libs"
+DEPENDS = "gtk+"
+PV = "0.1.0+svn${SVNREV}"
+PR = "r1"
+
+inherit openmoko2
+
+do_stage() {
+        autotools_stage_all
+}
+
+
+
+
diff --git a/packages/openmoko2/neod_svn.bb b/packages/openmoko2/neod_svn.bb
new file mode 100644
index 0000000000..fd417c69f3
--- /dev/null
+++ b/packages/openmoko2/neod_svn.bb
@@ -0,0 +1,7 @@
+DESCRIPTION = "Simple Neo1973 Daemon for Button Handling and Power Management"
+SECTION = "openmoko/daemons"
+DEPENDS = "gtk+ pulseaudio"
+PV = "0.1.0+svn${SVNREV}"
+PR = "r0"
+
+inherit openmoko2
diff --git a/packages/openmoko2/openmoko-calculator2_svn.bb b/packages/openmoko2/openmoko-calculator2_svn.bb
new file mode 100644
index 0000000000..8bb80c602b
--- /dev/null
+++ b/packages/openmoko2/openmoko-calculator2_svn.bb
@@ -0,0 +1,7 @@
+DESCRIPTION = "A Calculator for OpenMoko"
+SECTION = "openmoko/tools"
+DEPENDS = "libmokoui2"
+PV = "0.1.0+svn${SVNREV}"
+PR = "r0"
+
+inherit openmoko2
diff --git a/packages/openmoko2/openmoko-contacts2_svn.bb b/packages/openmoko2/openmoko-contacts2_svn.bb
new file mode 100644
index 0000000000..80d5d26f09
--- /dev/null
+++ b/packages/openmoko2/openmoko-contacts2_svn.bb
@@ -0,0 +1,12 @@
+DESCRIPTION = "The OpenMoko address book"
+SECTION = "openmoko/pim"
+RDEPENDS = "libedata-book"
+PV = "0.1.0+svn${SVNREV}"
+PR = "r2"
+
+inherit openmoko2
+
+SRC_URI = "svn://svn.o-hand.com/repos/contacts/branches;module=hito;proto=http"
+S = "${WORKDIR}/hito/"
+
+EXTRA_OECONF = "--disable-gnome-vfs --with-frontend=openmoko"
diff --git a/packages/openmoko2/openmoko-dialer2_svn.bb b/packages/openmoko2/openmoko-dialer2_svn.bb
new file mode 100644
index 0000000000..672f5d8cb1
--- /dev/null
+++ b/packages/openmoko2/openmoko-dialer2_svn.bb
@@ -0,0 +1,12 @@
+DESCRIPTION = "The OpenMoko Dialer"
+SECTION = "openmoko/pim"
+DEPENDS = "libmokogsmd2 libmokoui2 libmokojournal2 gstreamer"
+RDEPENDS = "gst-meta-audio"
+PV = "0.1.0+svn${SVNREV}"
+PR = "r2"
+
+inherit openmoko2
+
+EXTRA_OECONF = "--with-dbusbindir=${STAGING_BINDIR_NATIVE}"
+
+FILES_${PN} += "${datadir}/openmoko-dialer/ ${datadir}/dbus-1/services/"
diff --git a/packages/openmoko2/openmoko-feedreader2_svn.bb b/packages/openmoko2/openmoko-feedreader2_svn.bb
new file mode 100644
index 0000000000..04b08539f2
--- /dev/null
+++ b/packages/openmoko2/openmoko-feedreader2_svn.bb
@@ -0,0 +1,7 @@
+DESCRIPTION = "The OpenMoko Feed Reader"
+SECTION = "openmoko/apps"
+DEPENDS += "libmrss check webkit"
+PV = "0.0.1+svn${SVNREV}"
+PR = "r0"
+
+inherit openmoko2
diff --git a/packages/openmoko2/openmoko-icon-theme-standard2_svn.bb b/packages/openmoko2/openmoko-icon-theme-standard2_svn.bb
new file mode 100644
index 0000000000..e443e36075
--- /dev/null
+++ b/packages/openmoko2/openmoko-icon-theme-standard2_svn.bb
@@ -0,0 +1,18 @@
+DESCRIPTION = "Standard Gtk+ icon theme for the OpenMoko distribution"
+SECTION = "openmoko/base"
+PV = "0.1.0+svn${SVNREV}"
+PR = "r0"
+
+inherit openmoko2
+
+SRC_URI = "svn://svn.openmoko.org/trunk/src/target/OM-2007.2/artwork/;module=icons;proto=http"
+S = "${WORKDIR}/icons"
+
+pkg_postinst_${PN} () {
+    if [ "x$D" != "x" ]; then
+        exit 1
+    fi
+    gtk-update-icon-cache -q /usr/share/icons/openmoko-standard
+}
+
+PACKAGE_ARCH = "all"
diff --git a/packages/openmoko2/openmoko-session2.bb b/packages/openmoko2/openmoko-session2.bb
new file mode 100644
index 0000000000..86e1485003
--- /dev/null
+++ b/packages/openmoko2/openmoko-session2.bb
@@ -0,0 +1,28 @@
+DESCRIPTION = "Custom MB session files for poky"
+LICENSE = "GPL"
+SECTION = "x11"
+RDEPENDS = "matchbox-common matchbox-applet-startup-monitor matchbox-panel-2"
+RCONFLICTS = "openmoko-session"
+PR = "r23"
+
+SRC_URI = "file://etc"
+S = ${WORKDIR}
+
+do_install() {
+	cp -R ${S}/etc ${D}/etc
+	rm -fR ${D}/etc/.svn
+	rm -fR ${D}/etc/matchbox/.svn
+	chmod -R 755 ${D}/etc
+}
+
+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/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 int --set /desktop/poky/peripherals/mouse/drag_threshold 8
+}
diff --git a/packages/openmoko2/openmoko-session2/.mtn2git_empty b/packages/openmoko2/openmoko-session2/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/openmoko2/openmoko-session2/.mtn2git_empty
diff --git a/packages/openmoko2/openmoko-session2/etc/.mtn2git_empty b/packages/openmoko2/openmoko-session2/etc/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/openmoko2/openmoko-session2/etc/.mtn2git_empty
diff --git a/packages/openmoko2/openmoko-session2/etc/matchbox/.mtn2git_empty b/packages/openmoko2/openmoko-session2/etc/matchbox/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/openmoko2/openmoko-session2/etc/matchbox/.mtn2git_empty
diff --git a/packages/openmoko2/openmoko-session2/etc/matchbox/session b/packages/openmoko2/openmoko-session2/etc/matchbox/session
new file mode 100755
index 0000000000..60ce553f67
--- /dev/null
+++ b/packages/openmoko2/openmoko-session2/etc/matchbox/session
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+SHOWCURSOR="no"
+
+openmoko-today &
+openmoko-dialer &
+
+matchbox-window-manager -use_titlebar yes -use_desktop_mode decorated -theme openmoko-standard-2 -use_cursor $SHOWCURSOR $@ &
+
+exec matchbox-panel-2 --start-applets showdesktop,systray,startup \
+  --end-applets openmoko-panel-battery,openmoko-panel-gsm,openmoko-panel-gps,openmoko-panel-usb,openmoko-panel-bt,openmoko-panel-clock --titlebar
diff --git a/packages/openmoko2/openmoko-terminal2/.mtn2git_empty b/packages/openmoko2/openmoko-terminal2/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/openmoko2/openmoko-terminal2/.mtn2git_empty
diff --git a/packages/openmoko2/openmoko-terminal2/openmoko-terminal.desktop b/packages/openmoko2/openmoko-terminal2/openmoko-terminal.desktop
new file mode 100644
index 0000000000..2777736039
--- /dev/null
+++ b/packages/openmoko2/openmoko-terminal2/openmoko-terminal.desktop
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Terminal
+Comment=Command Line Interface Terminal
+Exec=mrxvt
+Icon=openmoko-terminal
+Terminal=false
+Type=Application
+Categories=GTK;Application;PIM;Office
+MimeType=text/x-vcard;
+SingleInstance=false
+StartupNotify=true
diff --git a/packages/openmoko2/openmoko-terminal2/openmoko-terminal.png b/packages/openmoko2/openmoko-terminal2/openmoko-terminal.png
new file mode 100644
index 0000000000..56e8e59628
--- /dev/null
+++ b/packages/openmoko2/openmoko-terminal2/openmoko-terminal.png
diff --git a/packages/openmoko2/openmoko-terminal2_1.0.0.bb b/packages/openmoko2/openmoko-terminal2_1.0.0.bb
new file mode 100644
index 0000000000..8d9a5245ca
--- /dev/null
+++ b/packages/openmoko2/openmoko-terminal2_1.0.0.bb
@@ -0,0 +1,42 @@
+DESCRIPTION = "The OpenMoko Command Line Console"
+SECTION = "openmoko/applications"
+RDEPENDS += "mrxvt"
+PR = "r1"
+
+inherit openmoko2
+
+SRC_URI = "file://openmoko-terminal.png \
+           file://openmoko-terminal.desktop"
+
+do_install() {
+        install -d ${D}${datadir}/pixmaps
+        install -d ${D}${datadir}/applications
+        install -m 0644 ${WORKDIR}/openmoko-terminal.png ${D}${datadir}/pixmaps/
+        install -m 0644 ${WORKDIR}/openmoko-terminal.desktop ${D}${datadir}/applications/
+}
+
+pkg_postinst_${PN}() {
+        if [ "x$D" != "x" ]; then
+                exit 1
+        fi
+		echo "adding font defaults to system-wide mrxvtrc..."
+		cat <<EOF >> ${sysconfdir}/mrxvt/mrxvtrc
+#
+# ---------------------------------- FONTS ----------------------------------- #
+#
+Mrxvt.xft:                      1
+Mrxvt.xftFont:                  Bitstream Vera Sans Mono
+Mrxvt.xftSize:                  8
+Mrxvt.xftAntialias:             1
+
+# Don't load a multi-char font. This will reduce the line space if your multi
+# char font has different dimensions than the regular font. You might need to
+# comment it out if you want to use XIM and non-english fonts.
+Mrxvt.xftNomFont:               1
+
+# Font to use for tab bar / menus. This need not be mono-spaced ;).
+Mrxvt.xftPFont:                 Bitstream Vera Sans
+Mrxvt.xftPSize:                 8
+EOF
+
+}
diff --git a/packages/openmoko2/openmoko-theme-standard2_svn.bb b/packages/openmoko2/openmoko-theme-standard2_svn.bb
new file mode 100644
index 0000000000..bbeba4420f
--- /dev/null
+++ b/packages/openmoko2/openmoko-theme-standard2_svn.bb
@@ -0,0 +1,25 @@
+DESCRIPTION = "Standard Gtk+ theme for the OpenMoko distribution"
+SECTION = "openmoko/base"
+RCONFLICTS = "openmoko-theme-standard"
+PV = "0.1.0+svnr${SRCDATE}"
+PR = "r2"
+
+inherit openmoko2
+
+SRC_URI = "svn://svn.openmoko.org/trunk/src/target/OM-2007.2/artwork/themes;module=openmoko-standard-2;proto=http"
+S = "${WORKDIR}/openmoko-standard-2"
+
+do_install() {
+	find ${WORKDIR} -name ".svn" | xargs rm -rf
+	install -d ${D}${datadir}/themes/openmoko-standard-2/gtk-2.0
+	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}"
diff --git a/packages/openmoko2/openmoko-today2_svn.bb b/packages/openmoko2/openmoko-today2_svn.bb
new file mode 100644
index 0000000000..93e0b47456
--- /dev/null
+++ b/packages/openmoko2/openmoko-today2_svn.bb
@@ -0,0 +1,8 @@
+DESCRIPTION = "The OpenMoko Application Launcher"
+SECTION = "openmoko/pim"
+DEPENDS = "libmokoui2 libmokojournal2 startup-notification dbus-glib libice libsm"
+RDEPENDS = "libedata-cal"
+PV = "0.1.0+svn${SVNREV}"
+PR = "r1"
+
+inherit openmoko2 gtk-icon-cache