52ed5f7382
- update to 4.0.72 (4.1 alpha 1) - parallel-devel patch ported by Lorenzo Villani <lvillani@binaryhelix.net> - update file list (Lorenzo Villani) - drop upstreamed khtml-security, kconfig_sync_crash and klauncher-crash patches - update xdg-menu (Administration menu) patch
60 lines
1.7 KiB
Diff
60 lines
1.7 KiB
Diff
diff -ur kdelibs-4.0.72/kded/applications.menu kdelibs-4.0.72-xdg-menu/kded/applications.menu
|
|
--- kdelibs-4.0.72/kded/applications.menu 2008-03-26 22:10:55.000000000 +0100
|
|
+++ kdelibs-4.0.72-xdg-menu/kded/applications.menu 2008-05-02 02:49:25.000000000 +0200
|
|
@@ -31,6 +31,7 @@
|
|
<Category>Core</Category>
|
|
<Not><Category>KDE</Category></Not>
|
|
</And>
|
|
+ <Category>X-Red-Hat-Base</Category>
|
|
<!-- Don't list SUSE's YaST in here -->
|
|
<Category>X-SuSE-YaST</Category>
|
|
<Category>X-KDE-settings-hardware</Category>
|
|
@@ -54,6 +55,24 @@
|
|
</Include>
|
|
</Menu>
|
|
<Menu>
|
|
+ <Name>System Settings</Name>
|
|
+ <Directory>SystemConfig.directory</Directory>
|
|
+ <Include>
|
|
+ <And>
|
|
+ <Category>System</Category>
|
|
+ <Category>Settings</Category>
|
|
+ <Not><Category>X-Red-Hat-ServerConfig</Category></Not>
|
|
+ </And>
|
|
+ </Include>
|
|
+ <Menu>
|
|
+ <Name>Server</Name>
|
|
+ <Directory>ServerConfig.directory</Directory>
|
|
+ <Include>
|
|
+ <Category>X-Red-Hat-ServerConfig</Category>
|
|
+ </Include>
|
|
+ </Menu>
|
|
+ </Menu>
|
|
+ <Menu>
|
|
<Name>Development</Name>
|
|
<Directory>kde-development.directory</Directory>
|
|
<Menu>
|
|
@@ -358,7 +377,11 @@
|
|
<Name>Settingsmenu</Name>
|
|
<Directory>kde-settingsmenu.directory</Directory>
|
|
<Include>
|
|
- <Category>Settings</Category>
|
|
+ <And>
|
|
+ <Category>Settings</Category>
|
|
+ <Not><Category>System</Category></Not>
|
|
+ <Not><Category>X-Red-Hat-ServerConfig</Category></Not>
|
|
+ </And>
|
|
</Include>
|
|
</Menu>
|
|
<Menu>
|
|
@@ -367,7 +390,9 @@
|
|
<Include>
|
|
<And>
|
|
<Category>System</Category>
|
|
+ <Not><Category>Settings</Category></Not>
|
|
<Not><Category>X-KDE-More</Category></Not>
|
|
+ <Not><Category>X-Red-Hat-ServerConfig</Category></Not>
|
|
</And>
|
|
</Include>
|
|
<Menu>
|