[Pkg-kde-commits] rev 1013 - in branches/kde-3.4.0/packages/kdelibs/debian: . patches

[Christopher Martin]

Author: chrsmrtn-guest
Date: 2005-04-21 17:34:16 +0000 (Thu, 21 Apr 2005)
New Revision: 1013

Modified:
   branches/kde-3.4.0/packages/kdelibs/debian/changelog
   branches/kde-3.4.0/packages/kdelibs/debian/patches/11_applications_menu.diff
Log:
Let's see if this breaks anything... weirdness abounds.


Modified: branches/kde-3.4.0/packages/kdelibs/debian/changelog
===================================================================
--- branches/kde-3.4.0/packages/kdelibs/debian/changelog	2005-04-21 15:39:00 UTC (rev 1012)
+++ branches/kde-3.4.0/packages/kdelibs/debian/changelog	2005-04-21 17:34:16 UTC (rev 1013)
@@ -30,6 +30,10 @@
 
   +++ Changes by Christopher Martin
 
+  * Adjust the placement of the merging of the Debian menu in
+    applications.menu. Oddly enough, this seems to work around some issues
+    with io slaves and remote file access.
+
   * Tighten libart-2.0-dev build dependency. (Closes: #285882)
 
   * Clean out useless manpages. New or better ones welcome...

Modified: branches/kde-3.4.0/packages/kdelibs/debian/patches/11_applications_menu.diff
===================================================================
--- branches/kde-3.4.0/packages/kdelibs/debian/patches/11_applications_menu.diff	2005-04-21 15:39:00 UTC (rev 1012)
+++ branches/kde-3.4.0/packages/kdelibs/debian/patches/11_applications_menu.diff	2005-04-21 17:34:16 UTC (rev 1013)
@@ -1,40 +1,14 @@
 --- kdelibs-orig/kded/applications.menu
 +++ kdelibs-patched/kded/applications.menu
-@@ -4,22 +4,36 @@
- <Menu>
- 	<Name>KDE</Name>
- 	<Directory>kde-main.directory</Directory>
--	<!-- Search the default locations -->
+@@ -378,4 +378,11 @@
+ 	</Include>
+ 	<DefaultMergeDirs/>
+ 	<MergeFile>applications-kmenuedit.menu</MergeFile>
 +
-+	<!-- Merge legacy hierarchy -->
- 	<KDELegacyDirs/>
-+
-+	<!-- Search the default locations -->
- 	<DefaultAppDirs/>
- 	<DefaultDirectoryDirs/>
-+
-+	<!-- Define default layout -->
- 	<DefaultLayout>
- 		<Merge type="menus"/>
- 		<Merge type="files"/>
- 		<Separator/>
- 		<Menuname>More</Menuname>
- 	</DefaultLayout>
-+
-+	<!-- Define layout of "Unknown" Applications -->
- 	<Layout>
- 		<Merge type="menus"/>
- 		<Menuname>Applications</Menuname>
- 		<Merge type="files"/>
- 	</Layout>
- 
-+	<!-- Debian submenu -->
 +	<Menu>
 +		<Name>Debian</Name>
 +		<Directory>debian.directory</Directory>
 +		<MergeFile>debian-menu.menu</MergeFile>
 +	</Menu>
 +
- 	<Menu>
- 		<Name>Applications</Name>
- 		<Directory>kde-unknown.directory</Directory>
+ </Menu>