e-wm: sync with openmoko

diff --git a/packages/e17/e-wm/applications.menu b/packages/e17/e-wm/applications.menu
index 9cd933a..032c6b7 100644 (file)
--- 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 41e27da..8716152 100644 (file)
--- 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"