diff options
| author |   Sebastian Spaeth <Sebastian@SSpaeth.de> | 2009-12-17 13:47:50 +0100 |
|---|---|---|
| committer | Sebastian Spaeth <Sebastian@SSpaeth.de> | 2009-12-17 13:47:50 +0100 |
| commit | f45580a1527dccdda100eee7f25f9f2c41af4db8 (patch) | |
| tree | 2218d4955f368e1804d86f212cc78317b4327f77 /recipes/e17/e-wm_svn.bb | |
| parent | 887b437869709625f5323438808ded9990cf590a (diff) | |
| parent | e3df24d64a48aff19aa9960dd9308a071b243b09 (diff) | |
| download | openembedded-f45580a1527dccdda100eee7f25f9f2c41af4db8.tar.gz | |
Merge commit 'origin/shr/merge' into shr/testing2009
Conflicts:
conf/distro/include/sane-srcrevs.inc
recipes/enotes/enotes_svn.bb
recipes/intone-video/intone-video_svn.bb
recipes/intone/intone_svn.bb
recipes/shr/shr-wizard_git.bb
recipes/tasks/task-shr-minimal.bb
Signed-off-by: Sebastian Spaeth <Sebastian@SSpaeth.de>
Diffstat (limited to 'recipes/e17/e-wm_svn.bb')
| -rw-r--r-- | recipes/e17/e-wm_svn.bb | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/recipes/e17/e-wm_svn.bb b/recipes/e17/e-wm_svn.bb index f31253be9e..0d86575550 100644 --- a/recipes/e17/e-wm_svn.bb +++ b/recipes/e17/e-wm_svn.bb @@ -3,7 +3,7 @@ DEPENDS = "eet evas ecore edje efreet edbus" LICENSE = "MIT BSD" SRCNAME = "e" PV = "0.16.999.060+svnr${SRCPV}" -PR = "r8" +PR = "r9" inherit e update-alternatives @@ -13,6 +13,7 @@ SRC_URI += "\ file://gsm-segfault-fix.patch;patch=1;maxrev=37617 \ file://fix-profiles.diff;patch=1;maxrev=39889 \ file://illume-flow.patch;patch=0;maxrev=43852 \ + file://drop-illume-keyboards.patch;patch=1 \ " SRC_URI_append_openmoko = " file://illume-disable-screensaver.patch;patch=1" @@ -147,7 +148,13 @@ FILES_${PN}-utils = "${libdir}/enlightenment/utils/*" FILES_${PN}-menu = "${sysconfdir}/xdg/menus/applications.menu" RRECOMMENDS_${PN}-config-default = "${PN}-theme-default" -RRECOMMENDS_${PN}-config-illume = "${PN}-theme-illume" +RRECOMMENDS_${PN}-config-illume = "\ + ${PN}-theme-illume \ + illume-keyboard-default-alpha \ + illume-keyboard-default-numeric \ + illume-keyboard-default-terminal \ +" + RRECOMMENDS_${PN}-config-minimalist = "\ ${PN}-background-light-gradient \ ${PN}-theme-default \ |