openmoko: merge with OE

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

1 files changed, 13 insertions, 4 deletions

diff --git a/meta-openmoko/packages/openmoko2/openmoko-tasks2_svn.bb b/meta-openmoko/packages/openmoko2/openmoko-tasks2_svn.bb
index c76ce709bb..b18c269814 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
+}
+