rev 4898 - in trunk/packages/kdemultimedia/debian: . patches

[Fathi Boudra]

Author: fboudra-guest
Date: 2006-11-13 14:31:17 +0100 (Mon, 13 Nov 2006)
New Revision: 4898

Removed:
   trunk/packages/kdemultimedia/debian/patches/11_applications_menu_move.diff
Modified:
   trunk/packages/kdemultimedia/debian/changelog
   trunk/packages/kdemultimedia/debian/kdemultimedia-kappfinder-data.install
Log:
Remaining changes related to applications-merged directory

Modified: trunk/packages/kdemultimedia/debian/changelog
===================================================================
--- trunk/packages/kdemultimedia/debian/changelog	2006-11-13 11:16:25 UTC (rev 4897)
+++ trunk/packages/kdemultimedia/debian/changelog	2006-11-13 13:31:17 UTC (rev 4898)
@@ -1,3 +1,14 @@
+kdemultimedia (4:3.5.5-2) unstable; urgency=low
+
+  +++ Changes by Fathi Boudra:
+
+  * Remove 11_applications_menu_move patch. We must use applications-merged as
+    the default merge directory.
+  * Update kdemultimedia-kappfinder-data.install to install
+    kde-multimedia-music.menu in applications-merged directory.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 13 Nov 2006 14:18:24 +0100
+
 kdemultimedia (4:3.5.5-1) unstable; urgency=low
 
   * New upstream release.

Modified: trunk/packages/kdemultimedia/debian/kdemultimedia-kappfinder-data.install
===================================================================
--- trunk/packages/kdemultimedia/debian/kdemultimedia-kappfinder-data.install	2006-11-13 11:16:25 UTC (rev 4897)
+++ trunk/packages/kdemultimedia/debian/kdemultimedia-kappfinder-data.install	2006-11-13 13:31:17 UTC (rev 4898)
@@ -1,4 +1,4 @@
-debian/tmp/etc/xdg/menus/kde-applications-merged/kde-multimedia-music.menu
+debian/tmp/etc/xdg/menus/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

Deleted: trunk/packages/kdemultimedia/debian/patches/11_applications_menu_move.diff