rev 4774 - in trunk/packages/kdebase/debian: . patches

[Fathi Boudra]

Author: fboudra-guest
Date: 2006-10-23 13:26:06 +0000 (Mon, 23 Oct 2006)
New Revision: 4774

Modified:
   trunk/packages/kdebase/debian/changelog
   trunk/packages/kdebase/debian/patches/20_applications_menu_move.diff
Log:
Fix an incompatability to the freedesktop.org menu specification #392807

Modified: trunk/packages/kdebase/debian/changelog
===================================================================
--- trunk/packages/kdebase/debian/changelog	2006-10-23 12:58:24 UTC (rev 4773)
+++ trunk/packages/kdebase/debian/changelog	2006-10-23 13:26:06 UTC (rev 4774)
@@ -34,6 +34,12 @@
     kdebase-kio-plugins Depends on kdesktop, so that kdeeject is always
     present.
 
+  * Update 20_applications_menu_move patch to fix an incomptability with
+    freedesktop.org menu specification: Note that a system that uses either
+    gnome-applications.menu or kde-applications.menu depending on the desktop
+    environment in use must still use applications-merged as the default merge
+    directory in both cases. Thanks to Kevin Krammer (Closes: #392807)
+
   * Version our build-conflict with nvidia-glx, since newer packages should
     work. (Closes: #393855)
 

Modified: trunk/packages/kdebase/debian/patches/20_applications_menu_move.diff
===================================================================
--- trunk/packages/kdebase/debian/patches/20_applications_menu_move.diff	2006-10-23 12:58:24 UTC (rev 4773)
+++ trunk/packages/kdebase/debian/patches/20_applications_menu_move.diff	2006-10-23 13:26:06 UTC (rev 4774)
@@ -1,14 +1,3 @@
---- kde.orig/applnk/Makefile.am
-+++ kde.patched/applnk/Makefile.am
-@@ -3,7 +3,7 @@
- xdg_menu_DATA = kde-settings.menu kde-information.menu kde-screensavers.menu
- 
- xdg_mergedmenu_DATA = kde-essential.menu
--xdg_mergedmenudir = $(xdg_menudir)/applications-merged
-+xdg_mergedmenudir = $(xdg_menudir)/kde-applications-merged
- 
- xdg_directory_DATA = \
- kde-main.directory \
 --- kde.orig/doc/userguide/kde-for-admins.docbook
 +++ kde.patched/doc/userguide/kde-for-admins.docbook
 @@ -1650,7 +1650,7 @@
@@ -29,12 +18,3 @@
  <programlisting>
  <markup>
               &lt;Menu&gt;
-@@ -1776,7 +1776,7 @@
- <title>Essential Menus</title>
- 
- <para><filename
--class="directory">$<envar>KDEDIR</envar>/etc/xdg/menus/applications-merged/</filename>
-+class="directory">$<envar>KDEDIR</envar>/etc/xdg/menus/kde-applications-merged/</filename>
- contains <filename>kde-essential.menu</filename> which includes some
- essential menus that are normally not shown in the &kde; menu itself:
- <itemizedlist>