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

[Christopher Martin]

Author: chrsmrtn-guest
Date: 2005-05-13 23:00:29 +0000 (Fri, 13 May 2005)
New Revision: 1059

Added:
   branches/kde-3.4.0/packages/kdemultimedia/debian/patches/11_applications_menu_move.diff
Modified:
   branches/kde-3.4.0/packages/kdemultimedia/debian/kdemultimedia-kappfinder-data.install
Log:
Adapt kdemultimedia to the new applications.menu location.


Modified: branches/kde-3.4.0/packages/kdemultimedia/debian/kdemultimedia-kappfinder-data.install
===================================================================
--- branches/kde-3.4.0/packages/kdemultimedia/debian/kdemultimedia-kappfinder-data.install	2005-05-11 12:23:41 UTC (rev 1058)
+++ branches/kde-3.4.0/packages/kdemultimedia/debian/kdemultimedia-kappfinder-data.install	2005-05-13 23:00:29 UTC (rev 1059)
@@ -1,4 +1,4 @@
-debian/tmp/etc/xdg/menus/applications-merged/kde-multimedia-music.menu
+debian/tmp/etc/xdg/menus/kde-applications-merged/kde-multimedia-music.menu
 debian/tmp/usr/share/apps/kappfinder/apps/Multimedia/ams.desktop
 debian/tmp/usr/share/apps/kappfinder/apps/Multimedia/amsynth.desktop
 debian/tmp/usr/share/apps/kappfinder/apps/Multimedia/ardour.desktop

Added: branches/kde-3.4.0/packages/kdemultimedia/debian/patches/11_applications_menu_move.diff
===================================================================
--- branches/kde-3.4.0/packages/kdemultimedia/debian/patches/11_applications_menu_move.diff	2005-05-11 12:23:41 UTC (rev 1058)
+++ branches/kde-3.4.0/packages/kdemultimedia/debian/patches/11_applications_menu_move.diff	2005-05-13 23:00:29 UTC (rev 1059)
@@ -0,0 +1,9 @@
+--- kde.orig/kappfinder-data/Makefile.am
++++ kde.patched/kappfinder-data/Makefile.am
+@@ -25,5 +25,5 @@
+ xdg_directory_DATA = kde-multimedia-music.directory
+ 
+ xdg_mergedmenu_DATA = kde-multimedia-music.menu
+-xdg_mergedmenudir = $(xdg_menudir)/applications-merged
++xdg_mergedmenudir = $(xdg_menudir)/kde-applications-merged
+