? depcomp
Index: desktop-directories/System-Settings.directory.in
===================================================================
RCS file: /cvs/gnome/gnome-menus/desktop-directories/System-Settings.directory.in,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 System-Settings.directory.in
--- desktop-directories/System-Settings.directory.in	9 Nov 2004 15:06:27 -0000	1.1.1.1
+++ desktop-directories/System-Settings.directory.in	6 Jan 2005 01:12:24 -0000
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Directory
-_Name=System Settings
+_Name=Administration
 _Comment=Change systemwide settings (affects all users)
 Icon=gnome-system
 Encoding=UTF-8
Index: layout/Makefile.am
===================================================================
RCS file: /cvs/gnome/gnome-menus/layout/Makefile.am,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile.am
--- layout/Makefile.am	9 Nov 2004 15:06:30 -0000	1.1.1.1
+++ layout/Makefile.am	6 Jan 2005 01:12:24 -0000
@@ -5,6 +5,7 @@ menudir = $(sysconfdir)/xdg/menus
 menu_DATA =               		\
 	applications.menu		\
 	preferences.menu		\
+	settings.menu			\
 	$(NULL)
 
 EXTRA_DIST= $(menu_DATA)
Index: layout/applications.menu
===================================================================
RCS file: /cvs/gnome/gnome-menus/layout/applications.menu,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 applications.menu
--- layout/applications.menu	9 Nov 2004 15:06:30 -0000	1.1.1.1
+++ layout/applications.menu	6 Jan 2005 01:12:24 -0000
@@ -18,29 +18,6 @@
   <!-- Read in overrides and child menus from applications-merged/ -->
   <DefaultMergeDirs/>
 
-  <!-- Merge in these other files as submenus -->
-  <Menu>
-    <Name>Preferences</Name>
-    <MergeFile>preferences.menu</MergeFile>
-  </Menu>
-
-  <Menu>
-    <Name>System Settings</Name>
-    <MergeFile>system-settings.menu</MergeFile>
-  </Menu>
-
-  <!-- Menu items to include in the toplevel -->
-  <Include>
-    <And>
-      <Category>Core</Category>
-    </And>
-  </Include>
-
-  <!-- Menu items to exclude from the toplevel -->
-  <Exclude>
-    <Filename>gnome-search-tool.desktop</Filename>
-  </Exclude>
-
   <!-- Accessories submenu -->
   <Menu>
     <Name>Accessories</Name>
@@ -146,18 +123,6 @@
       </And>
     </Include>
   </Menu> <!-- End Office -->
-
-  <!-- System Settings -->
-  <Menu>
-    <Name>System Settings</Name>
-    <Directory>System-Settings.directory</Directory>
-    <Include>
-      <And>
-        <Category>Settings</Category>
-        <Category>System</Category>
-      </And>
-    </Include>
-  </Menu>     <!-- End System Settings -->
 
   <!-- System Tools-->
   <Menu>
Index: layout/settings.menu
===================================================================
RCS file: layout/settings.menu
diff -N layout/settings.menu
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ layout/settings.menu	6 Jan 2005 01:12:24 -0000
@@ -0,0 +1,39 @@
+<!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN"
+ "http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd">
+
+<Menu>
+
+  <Name>Settings</Name>
+  <Directory>Settings.directory</Directory>
+
+  <!-- Scan legacy dirs first, as later items take priority -->
+  <KDELegacyDirs/>
+  <LegacyDir>/etc/X11/applnk</LegacyDir>
+  <LegacyDir>/usr/share/gnome/apps</LegacyDir>
+
+  <!-- Read standard .directory and .desktop file locations -->
+  <DefaultAppDirs/>
+  <DefaultDirectoryDirs/>
+
+  <!-- Read in overrides and child menus from applications-merged/ -->
+  <DefaultMergeDirs/>
+
+  <!-- Merge in these other files as submenus -->
+  <Menu>
+    <Name>Preferences</Name>
+    <MergeFile>preferences.menu</MergeFile>
+  </Menu>
+
+  <!-- System Settings -->
+  <Menu>
+    <Name>Administration</Name>
+    <Directory>System-Settings.directory</Directory>
+    <Include>
+      <And>
+        <Category>Settings</Category>
+        <Category>System</Category>
+      </And>
+    </Include>
+  </Menu>     <!-- End System Settings -->
+
+</Menu> <!-- End Applications -->
