[Pkg-e-commits] [SCM] Enlightenment 17 branch, new-svn-snapshot, updated. debian/0.16.999.050+svn20081207-1-7822-gcc26b1c

[Albin Tonnerre]

The following commit has been merged in the new-svn-snapshot branch:
commit cb93235f877bf6d1ccbe00ec40512cf5db0e5e73
Author: Albin Tonnerre <albin.tonnerre at gmail.com>
Date:   Wed Jun 24 22:41:37 2009 +0200

    Improve the menu file

diff --git a/debian/changelog b/debian/changelog
index bb6e019..f2a9dd6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ e17 (0.16.999.061-1) UNRELEASED; urgency=low
     - Previously patched in efreet. Allows the use of an e17-provided fallback
       menu in case efreet doesn't find any.
   * Update to Standards-Version 3.8.2, no change required
+  * Improve the e17-provided menu file, thanks Luca Capello (Closes: #532214)
 
  -- Albin Tonnerre <albin.tonnerre at gmail.com>  Fri, 19 Jun 2009 16:52:16 +0200
 
diff --git a/debian/enlightenment-applications.menu b/debian/enlightenment-applications.menu
index 88c3b5d..463362f 100644
--- a/debian/enlightenment-applications.menu
+++ b/debian/enlightenment-applications.menu
@@ -3,43 +3,63 @@
   PUBLIC '-//freedesktop//DTD Menu 1.0//EN'
   'http://standards.freedesktop.org/menu-spec/menu-1.0.dtd'>
 
-
 <Menu>
-	<Name>Applications</Name>
+    <Name>Applications</Name>
     <DefaultDirectoryDirs/>
     <DefaultAppDirs/>
 
     <Layout>
-          <Menuname>Audio-Video</Menuname>
-          <Menuname>Internet</Menuname>
-          <Menuname>Office</Menuname>
-          <Menuname>Graphics</Menuname>
-          <Menuname>Games</Menuname>
+          <Menuname>Accessories</Menuname>
           <Menuname>Development</Menuname>
+          <Menuname>Education</Menuname>
+          <Menuname>Games</Menuname>
+          <Menuname>Graphics</Menuname>
+          <Menuname>Multimedia</Menuname>
+          <Menuname>Network</Menuname>
+          <Menuname>Office</Menuname>
+          <Menuname>System Tools</Menuname>
           <Separator/>
           <Menuname>Settings</Menuname>
           <Menuname>Administration</Menuname>
     </Layout>
 
     <Menu>
-        <Name>Audio-Video</Name>
-        <Include> <Category>AudioVideo</Category> </Include>
+        <Name>Accessories</Name>
+        <Include><Category>Utility</Category></Include>
     </Menu>
     <Menu>
-        <Name>Internet</Name>
-        <Include> <Category>Network</Category> </Include>
+        <Name>Development</Name>
+        <Include><Category>Development</Category></Include>
     </Menu>
     <Menu>
-        <Name>Development</Name>
-        <Include> <Category>Development</Category> </Include>
+        <Name>Education</Name>
+        <Include><Category>Education</Category></Include>
     </Menu>
     <Menu>
-        <Name>Office</Name>
-        <Include> <Category>Office</Category> </Include>
+        <Name>Games</Name>
+        <Include><Category>Game</Category></Include>
     </Menu>
     <Menu>
         <Name>Graphics</Name>
-        <Include> <Category>Graphics</Category> </Include>
+        <Include><Category>Graphics</Category></Include>
+    </Menu>
+    <Menu>
+        <Name>Multimedia</Name>
+        <Include><Category>AudioVideo</Category></Include>
+    </Menu>
+    <Menu>
+        <Name>Network</Name>
+        <Include><Category>Network</Category></Include>
+    </Menu>
+    <Menu>
+        <Name>Office</Name>
+        <Include><Category>Office</Category></Include>
+    </Menu>
+    <Menu>
+        <Name>System Tools</Name>
+        <Include><And><Category>System</Category>
+                      <Not><Category>Settings</Category></Not></And>
+        </Include>
     </Menu>
     <Menu>
         <Name>Administration</Name>
@@ -49,8 +69,4 @@
         <Name>Settings</Name>
         <Include> <And><Category>System</Category><Not><Category>Settings</Category></Not></And> </Include>
     </Menu>
-    <Menu>
-        <Name>Games</Name>
-        <Include><Category>Game</Category></Include>
-    </Menu>
 </Menu>

-- 
Enlightenment 17