[oe-commits] org.oe.dev e-wm: sync with openmoko

[koen commit]

e-wm: sync with openmoko

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 21285f27c5841643fd19f202d0bec186f7ee13c6
ViewMTN: http://monotone.openembedded.org/revision/info/21285f27c5841643fd19f202d0bec186f7ee13c6
Files:
1
packages/e17/e-wm/applications.menu
packages/e17/e-wm_cvs.bb
Diffs:

#
# mt diff -rd33482138512960c4d2a2da71df7e4f5970d7fc1 -r21285f27c5841643fd19f202d0bec186f7ee13c6
#
#
#
# patch "packages/e17/e-wm/applications.menu"
#  from [4f7e730b41ad9992c457369c69a3b9abbf181b70]
#    to [a9a87d037d9d573ec145a458cb1435ddbc389695]
# 
# patch "packages/e17/e-wm_cvs.bb"
#  from [10fac6f3469627d641a1a831d9875c86b8b3edc3]
#    to [81f90d064b09ff63f767ff889341f23d3fa631f9]
#
============================================================
--- packages/e17/e-wm/applications.menu	4f7e730b41ad9992c457369c69a3b9abbf181b70
+++ packages/e17/e-wm/applications.menu	a9a87d037d9d573ec145a458cb1435ddbc389695
@@ -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>
 
============================================================
--- packages/e17/e-wm_cvs.bb	10fac6f3469627d641a1a831d9875c86b8b3edc3
+++ packages/e17/e-wm_cvs.bb	81f90d064b09ff63f767ff889341f23d3fa631f9
@@ -2,10 +2,12 @@ PV = "0.16.999.042+cvs${SRCDATE}"
 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"