From 51aa9a4c8c2ddb9c15c2c1ae7496aedbc5f13527 Mon Sep 17 00:00:00 2001
From: marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>
Date: Thu, 11 Jan 2007 06:10:57 +0000
Subject: Update to 2.17.5.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@8181 df743ca5-7f9a-e211-a948-0013205c9059
---
 .../files/patch-layout::preferences.menu           | 24 ++++++++++++----------
 x11/gnome-menus/files/patch-layout::settings.menu  | 22 --------------------
 2 files changed, 13 insertions(+), 33 deletions(-)
 delete mode 100644 x11/gnome-menus/files/patch-layout::settings.menu

(limited to 'x11/gnome-menus/files')

diff --git a/x11/gnome-menus/files/patch-layout::preferences.menu b/x11/gnome-menus/files/patch-layout::preferences.menu
index fef1dc0dc..582020423 100644
--- a/x11/gnome-menus/files/patch-layout::preferences.menu
+++ b/x11/gnome-menus/files/patch-layout::preferences.menu
@@ -1,5 +1,5 @@
---- layout/preferences.menu.orig	Sat Dec 11 07:58:50 2004
-+++ layout/preferences.menu	Tue Mar  1 01:28:57 2005
+--- layout/preferences.menu.orig	Tue Jan  9 12:51:48 2007
++++ layout/preferences.menu	Thu Jan 11 01:03:56 2007
 @@ -9,12 +9,15 @@
    <DefaultAppDirs/>
    <DefaultDirectoryDirs/>
@@ -19,21 +19,23 @@
        <Category>Settings</Category>
        <Not>
          <Or>
-@@ -36,10 +39,19 @@
-     <Directory>Settings-Accessibility.directory</Directory>
+@@ -88,6 +91,12 @@
+     <Directory>System.directory</Directory>
      <Include>
        <And>
 +        <Not>
-+          <Or>
-+            <Category>Qt</Category>
-+            <Category>KDE</Category>
-+          </Or>
-+        </Not>
++	  <Or>
++	    <Category>Qt</Category>
++	    <Category>KDE</Category>
++	  </Or>
++	</Not>
          <Category>Settings</Category>
-         <Category>Accessibility</Category>
+         <Or>
+           <Category>SystemSettings</Category>
+@@ -106,5 +115,8 @@
        </And>
      </Include>
-   </Menu>
+   </Menu> <!-- End System -->
 +
 +  <!-- Read in overrides and child menus from preferences-merged/ -->
 +  <DefaultMergeDirs/>
diff --git a/x11/gnome-menus/files/patch-layout::settings.menu b/x11/gnome-menus/files/patch-layout::settings.menu
deleted file mode 100644
index 115f03ce7..000000000
--- a/x11/gnome-menus/files/patch-layout::settings.menu
+++ /dev/null
@@ -1,22 +0,0 @@
---- layout/settings.menu.orig	Thu Apr 14 17:36:13 2005
-+++ layout/settings.menu	Tue May 17 18:42:56 2005
-@@ -25,10 +25,19 @@
-     <Directory>System-Settings.directory</Directory>
-     <Include>
-       <And>
-+        <Not>
-+          <Or>
-+            <Category>Qt</Category>
-+            <Category>KDE</Category>
-+          </Or>
-+        </Not>
-         <Category>Settings</Category>
-         <Category>System</Category>
-       </And>
-     </Include>
-   </Menu>     <!-- End System Settings -->
-+
-+  <!-- Read in overrides and child menus from settings-merged/ -->
-+  <DefaultMergeDirs/>
- 
- </Menu> <!-- End Applications -->
-- 
cgit v1.2.3