diff options
| author | Koen Kooi <koen@openembedded.org> | 2008-06-05 08:19:32 +0000 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2008-06-05 08:19:32 +0000 |
| commit | 5c8120a5d22db258ef98d3818492780c9e8b6b67 (patch) | |
| tree | 87caa28a58a6372f53fead1268984ace7951d3c1 | |
| parent | 9419ac7f6654d659f81fc3d652d5d95c222be47b (diff) | |
e-wm: sync with openmoko
| -rw-r--r-- | packages/e17/e-wm/applications.menu | 13 | ||||
| -rw-r--r-- | packages/e17/e-wm_cvs.bb | 6 |
2 files changed, 14 insertions, 5 deletions
diff --git a/packages/e17/e-wm/applications.menu b/packages/e17/e-wm/applications.menu index 9cd933a240..032c6b7d26 100644 --- a/packages/e17/e-wm/applications.menu +++ b/packages/e17/e-wm/applications.menu @@ -62,10 +62,15 @@ <Name>Settings</Name> <Directory>Settings.directory</Directory> <Include> - <Or> - <Category>SystemSettings</Category> - <Category>Settings</Category> - </Or> + <And> + <Or> + <Category>SystemSettings</Category> + <Category>Settings</Category> + </Or> + <Not> + <Category>System</Category> + </Not> + </And> </Include> </Menu> diff --git a/packages/e17/e-wm_cvs.bb b/packages/e17/e-wm_cvs.bb index 41e27da46a..87161526e0 100644 --- a/packages/e17/e-wm_cvs.bb +++ b/packages/e17/e-wm_cvs.bb @@ -2,10 +2,12 @@ DESCRIPTION = "The Enlightenment Window Mananger Version 17" DEPENDS = "eet evas ecore edje efreet" LICENSE = "MIT BSD" PV = "0.16.999.042+cvs${SRCDATE}" -PR = "r5" +PR = "r8" inherit e update-alternatives +RDEPENDS += "shared-mime-info mime-support" + SRC_URI = "${E_CVS};module=e17/apps/e \ file://disable-e-cursor.patch;patch=1 \ file://pkgconfig-fix.patch;patch=1;pnum=0;mindate=20080328;maxdate=20080401 \ @@ -58,6 +60,8 @@ FILES_${PN}-dev += "\ ${libdir}/enlightenment/preload/*.?a \ " +CONFFILES_${PN} = "/etc/xdg/menus/applications.menu" + ALTERNATIVE_PATH = "${bindir}/enlightenment_start.oe" ALTERNATIVE_NAME = "x-window-manager" ALTERNATIVE_LINK = "${bindir}/x-window-manager" |