shr-launcher: bump svnrev and merge recipe do_install changes from c_c

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

diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 17c896e..22fa976 100644 (file)
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -292,7 +292,7 @@ SRCREV_pn-shr-config ?= "37dd7ac950e2bfd438801faf34c29fccfdbbaccf"
 SRCREV_pn-shr-contacts ?= "9d7ca1cecb93022e5b890cd87756ac6f072710ca"
 SRCREV_pn-shr-dialer ?= "9d7ca1cecb93022e5b890cd87756ac6f072710ca"
 SRCREV_pn-shr-installer ?= "f17fa104639113fb0d3212b6bba366c092854cde"
-SRCREV_pn-shr-launcher ?= "87"
+SRCREV_pn-shr-launcher ?= "90"
 SRCREV_pn-shr-messages ?= "9d7ca1cecb93022e5b890cd87756ac6f072710ca"
 SRCREV_pn-shr-settings ?= "b92390148cf0e979fd4c678a6633bb5e436d5763"
 SRCREV_pn-shr-specs ?= "a881cd133439737708d4d4d150500246ceff7c7d"

diff --git a/recipes/shr/shr-launcher_svn.bb b/recipes/shr/shr-launcher_svn.bb
index ba3d98e..9d9f40d 100644 (file)
--- a/recipes/shr/shr-launcher_svn.bb
+++ b/recipes/shr/shr-launcher_svn.bb
@@ -6,7 +6,7 @@ SECTION = "e/apps"
 DEPENDS = "elementary eina edbus"
 
 PV = "0.0.1+svnr${SRCPV}"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "svn://shr-launcher.googlecode.com/svn/trunk;module=.;proto=http"
 
@@ -19,3 +19,17 @@ S = "${WORKDIR}"
 
 inherit autotools
 
+do_install_append() {
+        install -d "${D}/${datadir}/pixmaps"
+        install -m 0644 "${S}/resources/launcher.png" "${D}/${datadir}/pixmaps"
+        install -d "${D}/${datadir}/applications"
+        install -m 0644 "${S}/resources/launcher.desktop" "${D}/${datadir}/applications"
+        install -d "${D}/${datadir}/launcher"
+        for ico in "${S}/resources/"*.png; do
+                if [ "$(basename $ico)" != "launcher.png" ]; then
+                        install -m 0644 $ico "${D}/${datadir}/launcher"
+                fi
+        done
+}
+
+FILES_${PN} += "/usr/share/launcher/* /usr/share/applications/* /usr/share/pixmaps/*"