merge of '4a859de905afc30ec35cf91dcd1dd6c18307c1f8'

     and '9c6ceb61576fa98453a24fedb60c9d2b23d79c72'

12 files changed, 53 insertions, 65 deletions

diff --git a/packages/openmoko2/libmokopanelui2_svn.bb b/packages/openmoko2/libmokopanelui2_svn.bb
index bfeb22fd7b..03159cc864 100644
--- a/packages/openmoko2/libmokopanelui2_svn.bb
+++ b/packages/openmoko2/libmokopanelui2_svn.bb
@@ -1,11 +1,10 @@
 SECTION = "openmoko/libs"
-DEPENDS = "gtk+"
-PV = "0.1.0+svn${SVNREV}"
-PR = "r1" 
+DEPENDS = "gtk+ matchbox-panel-2"
+PV = "0.3.0+svn${SVNREV}"
+PR = "r0"
 
 inherit openmoko2
 
 do_stage() {
         autotools_stage_all
 }
-
diff --git a/packages/openmoko2/openmoko-common2_svn.bb b/packages/openmoko2/openmoko-common2_svn.bb
index f54a23de18..0cf7f763cb 100644
--- a/packages/openmoko2/openmoko-common2_svn.bb
+++ b/packages/openmoko2/openmoko-common2_svn.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Common files for the OpenMoko distribution"
 SECTION = "openmoko/base"
-PV = "0.0+svn${SRCDATE}"
+PV = "0.0+svnr${SRCREV}"
 PR = "r3"
 
 inherit openmoko2
diff --git a/packages/openmoko2/openmoko-dates2_svn.bb b/packages/openmoko2/openmoko-dates2_svn.bb
new file mode 100644
index 0000000000..9650a20b0d
--- /dev/null
+++ b/packages/openmoko2/openmoko-dates2_svn.bb
@@ -0,0 +1,12 @@
+DESCRIPTION = "The OpenMoko Calendar"
+SECTION = "openmoko/pim"
+DEPENDS = "libmokoui2 libmokojournal2 gtk+ libglade eds-dbus"
+RDEPENDS = "libedata-cal"
+PV = "0.1.0+svn${SVNREV}"
+
+inherit openmoko2
+
+SRC_URI = "svn://svn.o-hand.com/repos/dates/branches;module=jana;proto=http"
+S = "${WORKDIR}/jana/"
+
+EXTRA_OECONF = "--with-frontend=openmoko"
diff --git a/packages/openmoko2/openmoko-mediaplayer2_svn.bb b/packages/openmoko2/openmoko-mediaplayer2_svn.bb
index 871416c066..e353bcbaa7 100644
--- a/packages/openmoko2/openmoko-mediaplayer2_svn.bb
+++ b/packages/openmoko2/openmoko-mediaplayer2_svn.bb
@@ -1,10 +1,10 @@
 DESCRIPTION = "A media player for OpenMoko"
 SECTION = "openmoko/tools"
 DEPENDS = "libmokoui2 expat gstreamer libspiff"
+RDEPENDS = "gst-meta-audio"
 PV = "0.1.0+svn${SVNREV}"
-PR = "r0"
+PR = "r1"
 
 inherit openmoko2
 
 FILES_${PN} += "${datadir}/openmoko-mediaplayer"
-
diff --git a/packages/openmoko2/openmoko-session2.bb b/packages/openmoko2/openmoko-session2.bb
index 31d38382df..de2d7cdff6 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 = "r30"
+PR = "r31"
 
 SRC_URI = "file://etc"
 S = ${WORKDIR}
diff --git a/packages/openmoko2/openmoko-session2/etc/matchbox/session b/packages/openmoko2/openmoko-session2/etc/matchbox/session
index dee3e58051..4f2f8ae110 100755
--- a/packages/openmoko2/openmoko-session2/etc/matchbox/session
+++ b/packages/openmoko2/openmoko-session2/etc/matchbox/session
@@ -9,6 +9,6 @@ openmoko-dialer &
 matchbox-window-manager -use_titlebar yes -use_desktop_mode decorated -theme openmoko-standard-2 -use_cursor $SHOWCURSOR $@ &
 
 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-clock --titlebar &
+  --end-applets openmoko-panel-battery,openmoko-panel-gsm,openmoko-panel-gps,openmoko-panel-usb,openmoko-panel-bt,openmoko-panel-clock,keyboard --titlebar &
 
 exec neod
diff --git a/packages/openmoko2/openmoko-terminal2/.mtn2git_empty b/packages/openmoko2/openmoko-terminal2/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/openmoko2/openmoko-terminal2/.mtn2git_empty
+++ /dev/null
diff --git a/packages/openmoko2/openmoko-terminal2/openmoko-terminal.desktop b/packages/openmoko2/openmoko-terminal2/openmoko-terminal.desktop
deleted file mode 100644
index 2777736039..0000000000
--- a/packages/openmoko2/openmoko-terminal2/openmoko-terminal.desktop
+++ /dev/null
@@ -1,12 +0,0 @@
-[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
deleted file mode 100644
index 3b383c10e6..0000000000
--- a/packages/openmoko2/openmoko-terminal2/openmoko-terminal.png
+++ /dev/null
diff --git a/packages/openmoko2/openmoko-terminal2_1.0.0.bb b/packages/openmoko2/openmoko-terminal2_1.0.0.bb
deleted file mode 100644
index afb0592050..0000000000
--- a/packages/openmoko2/openmoko-terminal2_1.0.0.bb
+++ /dev/null
@@ -1,44 +0,0 @@
-DESCRIPTION = "The OpenMoko Command Line Console"
-SECTION = "openmoko/applications"
-RDEPENDS += "mrxvt"
-RCONFLICTS = "openmoko-terminal"
-RREPLACES = "openmoko-terminal"
-PR = "r5"
-
-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:                  5
-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:                 6
-EOF
-
-}
diff --git a/packages/openmoko2/openmoko-terminal2_svn.bb b/packages/openmoko2/openmoko-terminal2_svn.bb
new file mode 100644
index 0000000000..dc9acfec14
--- /dev/null
+++ b/packages/openmoko2/openmoko-terminal2_svn.bb
@@ -0,0 +1,7 @@
+DESCRIPTION = "The OpenMoko Command Line Console"
+SECTION = "openmoko/applications"
+DEPENDS = "libmokoui2 vte"
+PV = "2.1.0+${SVNREV}"
+PR = "r0"
+
+inherit openmoko2
diff --git a/packages/openmoko2/openmoko-theme-standard2-qvga_svn.bb b/packages/openmoko2/openmoko-theme-standard2-qvga_svn.bb
new file mode 100644
index 0000000000..6ac1c3fca4
--- /dev/null
+++ b/packages/openmoko2/openmoko-theme-standard2-qvga_svn.bb
@@ -0,0 +1,26 @@
+DESCRIPTION = "Standard Gtk+ theme for the OpenMoko distribution, QVGA edition"
+SECTION = "openmoko/base"
+RCONFLICTS = "openmoko-theme-standard"
+RPROVIDES = "openmoko-theme-standard-2"
+PV = "0.1.0+${SVNREV}"
+PR = "r0"
+
+inherit openmoko2
+
+SRC_URI = "svn://svn.openmoko.org/trunk/src/target/OM-2007.2/artwork/themes;module=openmoko-standard-2-qvga;proto=http"
+S = "${WORKDIR}/openmoko-standard-2-qvga"
+
+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}"