From 37b425c26ffd596bcb2bf84d68e69db9d66435d1 Mon Sep 17 00:00:00 2001
From: Julien Lavergne <gilir@ubuntu.com>
Date: Sat, 12 Feb 2011 17:20:09 +0100
Subject: [PATCH] Split Preferences and System menus (LP: #650432).

---
 debian/changelog                             |  1 +
 etc/xdg/lubuntu/menus/lxde-applications.menu | 35 ++++++++++++--------
 2 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 83243f8..6b478ab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ lubuntu-default-settings (0.17) UNRELEASED; urgency=low
 
   * etc/xdg/lubuntu/menus/lxde-applications.menu:
    - Add a specific menu structure for lubuntu session.
+   - Split Preferences and System menus (LP: #650432).
 
  -- Julien Lavergne <gilir@ubuntu.com>  Sat, 11 Dec 2010 17:56:20 +0100
 
diff --git a/etc/xdg/lubuntu/menus/lxde-applications.menu b/etc/xdg/lubuntu/menus/lxde-applications.menu
index edc6bfb..02c48a4 100644
--- a/etc/xdg/lubuntu/menus/lxde-applications.menu
+++ b/etc/xdg/lubuntu/menus/lxde-applications.menu
@@ -104,18 +104,6 @@
         </Include>
     </Menu>
 
-    <Menu>
-        <Name>System</Name>
-        <Directory>lxde-system-tools.directory</Directory>
-        <Include>
-            <And>
-                <Category>System</Category>
-                <Not><Category>Settings</Category></Not>
-                <Not><Category>PackageManager</Category></Not>
-            </And>
-        </Include>
-    </Menu>
-
     <Menu>
         <Name>Other</Name>
         <Directory>lxde-other.directory</Directory>
@@ -129,7 +117,6 @@
         </Include>
     </Menu>
 
-
 <!-- Preferences Menu, to include in Layout section -->
     <Menu>
         <Name>DesktopSettings</Name>
@@ -138,8 +125,26 @@
         <Include>
             <Or>
                 <Category>Settings</Category>
-                <Category>PackageManager</Category>
+                <Not><Category>PackageManager</Category><Not>
+                <Not><Category>System</Category><Not>
+            </Or>
+        </Include>
+        <Layout>
+            <Merge type="menus"/>
+            <Merge type="files"/>
+        </Layout>
+    </Menu>
+
+<!-- System Menu, to include in Layout section -->
+    <Menu>
+        <Name>System</Name>
+        <Directory>lxde-system-tools.directory</Directory>
+        <OnlyUnallocated/>
+        <Include>
+            <Or>
                 <Category>System</Category>
+                <Category>PackageManager</Category>
+                <Not><Category>Settings</Category></Not>
             </Or>
         </Include>
         <Layout>
@@ -160,6 +165,8 @@
         <Separator/>
         <Merge type="all"/>
         <Separator/>
+        <Menuname>System</Menuname>
+        <Separator/>
         <Menuname>DesktopSettings</Menuname>
         <Separator/>
         <Filename>synaptic.desktop</Filename>