illume-keyboards-shr: install directly to illume/keyboards (do not use subdir for each keyboard)

* Newer illume isn't looking for keyboards in subdirectories of
  /usr/lib/enlightenment/modules/illume/keyboards/

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

2 files changed, 15 insertions, 14 deletions

diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index c4d1e093aa..b0c9d682e3 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -77,7 +77,7 @@ SRCREV_pn-gridpad ?= "194"
 SRCREV_pn-gtkhtml2 ?= "1158"
 SRCREV_pn-gypsy ?= "134"
 SRCREV_pn-hildon-1 ?= "14429"
-SRCREV_pn-illume-keyboards-shr ?= "7bcdd55dc0cf6f3b50fd0226345592f538301b8a"
+SRCREV_pn-illume-keyboards-shr ?= "ebbc388b26578f60f3d68ea5631c47a11afa49c0"
 SRCREV_pn-illume-theme-freesmartphone ?= "b1b0f6adc59e6f72a3929771058e3750bf181bc5"
 SRCREV_pn-intuition ?= "194"
 SRCREV_pn-kismet ?= "2285"
diff --git a/recipes/e17/illume-keyboards-shr_git.bb b/recipes/e17/illume-keyboards-shr_git.bb
index 6dcd971d4e..fc70456a6f 100644
--- a/recipes/e17/illume-keyboards-shr_git.bb
+++ b/recipes/e17/illume-keyboards-shr_git.bb
@@ -25,57 +25,58 @@ illume-keyboard-persian \
 "
 
 PACKAGE_ARCH = "all"
+KEYBOARDS_DIR="${libdir}/enlightenment/modules/illume/keyboards"
 
 AUTHOR_illume-keyboard-arabic = "Mohammad Fahmi / Tom Hacohen"
 DESCRIPTION_illume-keyboard-arabic = "Illume keyboard with arabic layout"
-FILES_illume-keyboard-arabic = "${libdir}/enlightenment/modules/illume/keyboards/arabic"
+FILES_illume-keyboard-arabic = "${KEYBOARDS_DIR}/Arabic.kbd ${KEYBOARDS_DIR}/Arabic.png"
 
 AUTHOR_illume-keyboard-browse = "Pander"
 DESCRIPTION_illume-keyboard-browse = "Illume keyboard with a layout optimized for browsing"
-FILES_illume-keyboard-browse = "${libdir}/enlightenment/modules/illume/keyboards/browse"
+FILES_illume-keyboard-browse = "${KEYBOARDS_DIR}/Browse.kbd ${KEYBOARDS_DIR}/end-browse.png ${KEYBOARDS_DIR}/pagedown-browse.png ${KEYBOARDS_DIR}/browse.png ${KEYBOARDS_DIR}/home-browse.png ${KEYBOARDS_DIR}/pageup-browse.png ${KEYBOARDS_DIR}/space-browse.png"
 
 AUTHOR_illume-keyboard-danish = "Esben Damgaard"
 DESCRIPTION_illume-keyboard-danish = "Illume keyboard with danish layout"
-FILES_illume-keyboard-danish = "${libdir}/enlightenment/modules/illume/keyboards/danish"
+FILES_illume-keyboard-danish = "${KEYBOARDS_DIR}/Danish.kbd ${KEYBOARDS_DIR}/danish.png"
 
 AUTHOR_illume-keyboard-default-alt = "Pander"
 DESCRIPTION_illume-keyboard-default-alt = "Illume keyboard with an alternative default layout"
-FILES_illume-keyboard-default-alt = "${libdir}/enlightenment/modules/illume/keyboards/default-alt"
+FILES_illume-keyboard-default-alt = "${KEYBOARDS_DIR}/Default-alt.kbd"
 
 AUTHOR_illume-keyboard-dutch = "Pander"
 DESCRIPTION_illume-keyboard-dutch = "Illume keyboard with dutch layout"
-FILES_illume-keyboard-dutch = "${libdir}/enlightenment/modules/illume/keyboards/dutch"
+FILES_illume-keyboard-dutch = "${KEYBOARDS_DIR}/capslock-negative.png ${KEYBOARDS_DIR}/end.png ${KEYBOARDS_DIR}/pagedown.png ${KEYBOARDS_DIR}/qwerty-dutch-nl.png ${KEYBOARDS_DIR}/Terminal-dutch-nl.kbd ${KEYBOARDS_DIR}/capslock.png ${KEYBOARDS_DIR}/home.png ${KEYBOARDS_DIR}/pageup.png ${KEYBOARDS_DIR}/space.png"
 
 AUTHOR_illume-keyboard-dvorak = "Gabor Adam TOTH"
 DESCRIPTION_illume-keyboard-dvorak = "Illume keyboard with dvorak layout"
-FILES_illume-keyboard-dvorak = "${libdir}/enlightenment/modules/illume/keyboards/dvorak"
+FILES_illume-keyboard-dvorak = "${KEYBOARDS_DIR}/Dvorak.kbd ${KEYBOARDS_DIR}/dvorak.png"
 
 DESCRIPTION_illume-keyboard-french = "Illume keyboard with french layout"
-FILES_illume-keyboard-french = "${libdir}/enlightenment/modules/illume/keyboards/french"
+FILES_illume-keyboard-french = "${KEYBOARDS_DIR}/Azerty.kbd ${KEYBOARDS_DIR}/Azerty.png"
 
 AUTHOR_illume-keyboard-german = "Florian Hackenberger"
 DESCRIPTION_illume-keyboard-german = "Illume keyboard with german layout"
-FILES_illume-keyboard-german = "${libdir}/enlightenment/modules/illume/keyboards/german"
+FILES_illume-keyboard-german = "${KEYBOARDS_DIR}/German.kbd ${KEYBOARDS_DIR}/German.png"
 
 AUTHOR_illume-keyboard-hebrew = "Tom Hacohen"
 DESCRIPTION_illume-keyboard-hebrew = "Illume keyboard with hebrew layout"
-FILES_illume-keyboard-hebrew = "${libdir}/enlightenment/modules/illume/keyboards/hebrew"
+FILES_illume-keyboard-hebrew = "${KEYBOARDS_DIR}/Hebrew.kbd ${KEYBOARDS_DIR}/Alpha-hebrew-il.png"
 
 AUTHOR_illume-keyboard-numeric-alt = "Pander"
 DESCRIPTION_illume-keyboard-numeric-alt = "Illume keyboard with an alternative numeric layout"
-FILES_illume-keyboard-numeric-alt = "${libdir}/enlightenment/modules/illume/keyboards/numeric-alt"
+FILES_illume-keyboard-numeric-alt = "${KEYBOARDS_DIR}/Numbers-alt.kbd ${KEYBOARDS_DIR}/numeric-alt.png"
 
 AUTHOR_illume-keyboard-russian = "lucky"
 DESCRIPTION_illume-keyboard-russian = "Illume keyboard with russian layout"
-FILES_illume-keyboard-russian = "${libdir}/enlightenment/modules/illume/keyboards/russian"
+FILES_illume-keyboard-russian = "${KEYBOARDS_DIR}/X8_Russian.kbd ${KEYBOARDS_DIR}/X8-russian-ru.png"
 
 AUTHOR_illume-keyboard-russian-terminal = "lucky"
 DESCRIPTION_illume-keyboard-russian-terminal = "Illume keyboard with russian layout for the Terminal"
-FILES_illume-keyboard-russian-terminal = "${libdir}/enlightenment/modules/illume/keyboards/russian-terminal"
+FILES_illume-keyboard-russian-terminal = "${KEYBOARDS_DIR}/Terminal_Russian.kbd ${KEYBOARDS_DIR}/Terminal-russian-ru.png"
 
 AUTHOR_illume-keyboard-persian = "slave"
 DESCRIPTION_illume-keyboard-persian = "Illume keyboard with persian layout"
-FILES_illume-keyboard-persian = "${libdir}/enlightenment/modules/illume/keyboards/persian"
+FILES_illume-keyboard-persian = "${KEYBOARDS_DIR}/Persian.kbd ${KEYBOARDS_DIR}/Persian.png"
 
 do_install() {
 	make DESTDIR=${D} install