[oe-commits] Martin Jansa : e-tasks: bump srcrev, update recipe from c_c, fix docs dir

[git version control]

Module: openembedded.git
Branch: shr/merge
Commit: 298787c63e0c67d13d7e24de380eb6765b4f9dee
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=298787c63e0c67d13d7e24de380eb6765b4f9dee

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Tue Dec  8 10:37:28 2009 +0100

e-tasks: bump srcrev, update recipe from c_c, fix docs dir

Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>

---

 conf/distro/include/sane-srcrevs.inc |    2 +-
 recipes/e17/e-tasks_svn.bb           |   27 ++++++++++++++++++++++++---
 recipes/shr/shr-launcher_svn.bb      |    3 ++-
 3 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 5a24362..902c844 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -46,7 +46,7 @@ SRCREV_pn-dfu-util-native ?= "4160"
 SRCREV_pn-disko ?= "f52597b8d5d584811cbe8f9e0bf25ea372526953"
 SRCREV_pn-diversity-daemon ?= "571"
 SRCREV_pn-diversity-radar ?= "453"
-SRCREV_pn-e-tasks ?= "14"
+SRCREV_pn-e-tasks ?= "15"
 SRCREV_pn-e-wm-config-illume-shr ?= "bbcec18f0ebd47e4f6eea88b9b774edf7400e752"
 SRCREV_pn-e-wm-illume-dict-pl ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
 SRCREV_pn-e-wm-menu-shr ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
diff --git a/recipes/e17/e-tasks_svn.bb b/recipes/e17/e-tasks_svn.bb
index 4f27744..081a47d 100644
--- a/recipes/e17/e-tasks_svn.bb
+++ b/recipes/e17/e-tasks_svn.bb
@@ -1,9 +1,11 @@
-DESCRIPTION = "tasks app for openmoko phones based on elementary"
+DESCRIPTION = "e-tasks is a todo program for Openmoko phones"
 HOMEPAGE = "http://code.google.com/p/e-tasks/"
 AUTHOR = "cchandel"
 LICENSE = "GPLv2"
 SECTION = "e/apps"
-#DEPENDS = "elementary eina edbus"
+DEPENDS = "elementary eina edbus sqlite3"
+
+inherit autotools
 
 PV = "0.0.1+svnr${SRCPV}"
 PR = "r0"
@@ -11,5 +13,24 @@ PR = "r0"
 SRC_URI = "svn://e-tasks.googlecode.com/svn/trunk;module=.;proto=http"
 S = "${WORKDIR}"
 
-inherit autotools
+do_configure_prepend() {
+  rm -f ${S}/config.log
+  rm -f ${S}/config.status
+  sed -i "s#tasksdocdir = \$.prefix./doc/tasks#tasksdocdir = \$(datadir)/doc/e-tasks#g" ${S}/Makefile.am
+  sed -i "s#gladedir = \$(datadir)/tasks/glade#gladedir = \$(datadir)/e-tasks/glade#g" ${S}/src/Makefile.am
+}
+
+do_install_append() {
+        install -d "${D}/${datadir}/pixmaps"
+        install -m 0644 "${S}/resources/e-tasks.png" "${D}/${datadir}/pixmaps"
+        install -d "${D}/${datadir}/applications"
+        install -m 0644 "${S}/resources/e-tasks.desktop" "${D}/${datadir}/applications"
+        install -d  "${D}/${datadir}/e-tasks"
+        for ico in "${S}/resources/"*.png; do
+                if [ "$(basename $ico)" != "e-tasks.png" ]; then
+                        install -m 0644 $ico "${D}/${datadir}/e-tasks"
+                fi
+        done
+}
 
+FILES_${PN} += "/usr/share/e-tasks/* /usr/share/applications/* /usr/share/pixmaps/*"
diff --git a/recipes/shr/shr-launcher_svn.bb b/recipes/shr/shr-launcher_svn.bb
index 9d9f40d..84e5399 100644
--- a/recipes/shr/shr-launcher_svn.bb
+++ b/recipes/shr/shr-launcher_svn.bb
@@ -6,13 +6,14 @@ SECTION = "e/apps"
 DEPENDS = "elementary eina edbus"
 
 PV = "0.0.1+svnr${SRCPV}"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "svn://shr-launcher.googlecode.com/svn/trunk;module=.;proto=http"
 
 do_configure_prepend() {
   rm -f ${S}/config.log
   rm -f ${S}/config.status
+  sed -i "s#launcherdocdir = \$.prefix./doc/launcher#launcherdocdir = \$(datadir)/doc/shr-launcher#g" ${S}/Makefile.am
 }
 
 S = "${WORKDIR}"