merge of '2ef8a2b13a8a5d81ce6663db27657a18b66de8cb'

     and '81722d85338d326b44bc58a0fe61f15c7fbd724f'

13 files changed, 39 insertions, 36 deletions

diff --git a/packages/openmoko2/libmokogsmd2_svn.bb b/packages/openmoko2/libmokogsmd2_svn.bb
index 8fe54f3348..2551519348 100644
--- a/packages/openmoko2/libmokogsmd2_svn.bb
+++ b/packages/openmoko2/libmokogsmd2_svn.bb
@@ -1,6 +1,6 @@
 SECTION = "openmoko/libs"
 DEPENDS = "libgsmd glib-2.0"
-PV = "0.1.0+svn${SRCDATE}"
+PV = "0.1.0+svn${SVNREV}"
 PR = "r1"
 
 inherit openmoko2
diff --git a/packages/openmoko2/libmokojournal2_svn.bb b/packages/openmoko2/libmokojournal2_svn.bb
index e5a1fe74f8..007131659a 100644
--- a/packages/openmoko2/libmokojournal2_svn.bb
+++ b/packages/openmoko2/libmokojournal2_svn.bb
@@ -1,6 +1,6 @@
 SECTION = "openmoko/libs"
 DEPENDS = "eds-dbus"
-PV = "0.1.0+svn${SRCDATE}"
+PV = "0.1.0+svn${SVNREV}"
 PR = "r1"
 
 inherit openmoko2
diff --git a/packages/openmoko2/libmokopanelui2_svn.bb b/packages/openmoko2/libmokopanelui2_svn.bb
index c76729e619..bfeb22fd7b 100644
--- a/packages/openmoko2/libmokopanelui2_svn.bb
+++ b/packages/openmoko2/libmokopanelui2_svn.bb
@@ -1,6 +1,6 @@
 SECTION = "openmoko/libs"
 DEPENDS = "gtk+"
-PV = "0.1.0+svn${SRCDATE}"
+PV = "0.1.0+svn${SVNREV}"
 PR = "r1" 
 
 inherit openmoko2
diff --git a/packages/openmoko2/libmokoui2_svn.bb b/packages/openmoko2/libmokoui2_svn.bb
index f818578c21..86372ae274 100644
--- a/packages/openmoko2/libmokoui2_svn.bb
+++ b/packages/openmoko2/libmokoui2_svn.bb
@@ -1,6 +1,6 @@
 SECTION = "openmoko/libs"
 DEPENDS = "gtk+"
-PV = "0.1.0+svn${SRCDATE}"
+PV = "0.1.0+svn${SVNREV}"
 PR = "r1"
 
 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
index e44f387fc7..80d5d26f09 100644
--- a/packages/openmoko2/openmoko-contacts2_svn.bb
+++ b/packages/openmoko2/openmoko-contacts2_svn.bb
@@ -1,12 +1,12 @@
 DESCRIPTION = "The OpenMoko address book"
 SECTION = "openmoko/pim"
 RDEPENDS = "libedata-book"
-PV = "0.1+svn${SRCDATE}"
+PV = "0.1.0+svn${SVNREV}"
 PR = "r2"
 
 inherit openmoko2
 
-SRC_URI = "svn://svn.o-hand.com/repos/contacts/branches/;module=hito;proto=http"
+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
index ccbd6f8775..17bba22a72 100644
--- a/packages/openmoko2/openmoko-dialer2_svn.bb
+++ b/packages/openmoko2/openmoko-dialer2_svn.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "The OpenMoko Dialer"
 SECTION = "openmoko/pim"
 DEPENDS = "libmokogsmd2 libmokoui2 libmokojournal2"
-PV = "0.1.0+svn${SRCDATE}"
+PV = "0.1.0+svn${SVNREV}"
 PR = "r1"
 
 inherit openmoko2
diff --git a/packages/openmoko2/openmoko-feedreader2_svn.bb b/packages/openmoko2/openmoko-feedreader2_svn.bb
index 41f28ed6a1..04b08539f2 100644
--- a/packages/openmoko2/openmoko-feedreader2_svn.bb
+++ b/packages/openmoko2/openmoko-feedreader2_svn.bb
@@ -1,9 +1,7 @@
-DESCRIPTION = "The OpenMoko RSS Reader"
-SECTION = "openmoko/applications"
+DESCRIPTION = "The OpenMoko Feed Reader"
+SECTION = "openmoko/apps"
 DEPENDS += "libmrss check webkit"
-
-PV = "0.0.1+svn${SRCDATE}"
+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-icon-theme-standard_svn.bb b/packages/openmoko2/openmoko-icon-theme-standard_svn.bb
deleted file mode 100644
index 8029e1fbc9..0000000000
--- a/packages/openmoko2/openmoko-icon-theme-standard_svn.bb
+++ /dev/null
@@ -1,19 +0,0 @@
-DESCRIPTION = "Standard Gtk+ icon theme for the OpenMoko distribution"
-SECTION = "openmoko/base"
-PV = "0.1.0+svn${SRCDATE}"
-PR = "r1"
-
-inherit openmoko-base autotools
-
-SRC_URI = "${OPENMOKO_MIRROR}/src/target/${OPENMOKO_RELEASE}/artwork;module=icons;proto=http"
-S = "${WORKDIR}/icons"
-
-PACKAGE_ARCH = "all"
-
-pkg_postinst_${PN} () {
-        if [ "x$D" != "x" ]; then
-                exit 1
-        fi
-        gtk-update-icon-cache -q /usr/share/icons/openmoko-standard
-}
-
diff --git a/packages/openmoko2/openmoko-session2/etc/matchbox/session b/packages/openmoko2/openmoko-session2/etc/matchbox/session
index 6c8c62dca5..60ce553f67 100755
--- a/packages/openmoko2/openmoko-session2/etc/matchbox/session
+++ b/packages/openmoko2/openmoko-session2/etc/matchbox/session
@@ -7,5 +7,5 @@ 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 --end-applets clock,battery,systray,startup --titlebar
-
+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-theme-standard2_svn.bb b/packages/openmoko2/openmoko-theme-standard2_svn.bb
index ed707a9617..a5f3108093 100644
--- a/packages/openmoko2/openmoko-theme-standard2_svn.bb
+++ b/packages/openmoko2/openmoko-theme-standard2_svn.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Standard Gtk+ theme for the OpenMoko distribution"
 SECTION = "openmoko/base"
 RCONFLICTS = "openmoko-theme-standard"
-PV = "0.1.0+svn${SRCDATE}"
+PV = "0.1.0+svnr${SRCDATE}"
 PR = "r1"
 
 inherit openmoko2
diff --git a/packages/openmoko2/openmoko-today2_svn.bb b/packages/openmoko2/openmoko-today2_svn.bb
index a38be614f4..c998504af1 100644
--- a/packages/openmoko2/openmoko-today2_svn.bb
+++ b/packages/openmoko2/openmoko-today2_svn.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "The OpenMoko Application Launcher"
 SECTION = "openmoko/pim"
 DEPENDS = "libmokoui2 startup-notification dbus-glib libice libsm"
-
-PV = "0.1.0+srvn${SRCDATE}"
+PV = "0.1.0+svn${SVNREV}"
 
 inherit openmoko2 gtk-icon-cache