rev 7726 - branches/kde4/packages/kdelibs/debian/patches

[Fathi Boudra]

Author: fboudra-guest
Date: 2007-10-30 20:44:27 +0000 (Tue, 30 Oct 2007)
New Revision: 7726

Added:
   branches/kde4/packages/kdelibs/debian/patches/11_kde4_applications_menu.diff
   branches/kde4/packages/kdelibs/debian/patches/12_deprecate_applnk.diff
Modified:
   branches/kde4/packages/kdelibs/debian/patches/series
Log:
* commit patches



Added: branches/kde4/packages/kdelibs/debian/patches/11_kde4_applications_menu.diff
===================================================================
--- branches/kde4/packages/kdelibs/debian/patches/11_kde4_applications_menu.diff	                        (rev 0)
+++ branches/kde4/packages/kdelibs/debian/patches/11_kde4_applications_menu.diff	2007-10-30 20:44:27 UTC (rev 7726)
@@ -0,0 +1,22 @@
+--- a/kded/CMakeLists.txt
++++ b/kded/CMakeLists.txt
+@@ -69,7 +69,7 @@
+ 
+ ########### install files ###############
+ 
+-install( FILES applications.menu  DESTINATION  ${SYSCONF_INSTALL_DIR}/xdg/menus )
++install( FILES applications.menu  DESTINATION  ${SYSCONF_INSTALL_DIR}/xdg/menus RENAME kde4-applications.menu)
+ install( FILES kdedmodule.desktop  DESTINATION  ${SERVICETYPES_INSTALL_DIR} )
+ install( FILES kded.upd  DESTINATION  ${DATA_INSTALL_DIR}/kconf_update )
+ 
+--- a/kded/kbuildsycoca.cpp
++++ b/kded/kbuildsycoca.cpp
+@@ -374,7 +374,7 @@
+      connect(g_vfolder, SIGNAL(newService(const QString &, KService::Ptr *)),
+              this, SLOT(slotCreateEntry(const QString &, KService::Ptr *)));
+ 
+-     VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("applications.menu", true);
++     VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("kde4-applications.menu", true);
+ 
+      KServiceGroup::Ptr entry = g_bsgf->addNew("/", kdeMenu->directoryFile, KServiceGroup::Ptr(), false);
+      entry->setLayoutInfo(kdeMenu->layoutList);

Added: branches/kde4/packages/kdelibs/debian/patches/12_deprecate_applnk.diff
===================================================================
--- branches/kde4/packages/kdelibs/debian/patches/12_deprecate_applnk.diff	                        (rev 0)
+++ branches/kde4/packages/kdelibs/debian/patches/12_deprecate_applnk.diff	2007-10-30 20:44:27 UTC (rev 7726)
@@ -0,0 +1,8 @@
+--- a/config-prefix.h.cmake
++++ b/config-prefix.h.cmake
+@@ -35,4 +35,4 @@
+ #define SYSCONF_INSTALL_DIR "${SYSCONF_INSTALL_DIR}"
+ 
+ /* Only used by KStandardDirs */
+-#define APPLNK_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/applnk"
++#define APPLNK_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/applications"

Modified: branches/kde4/packages/kdelibs/debian/patches/series
===================================================================
--- branches/kde4/packages/kdelibs/debian/patches/series	2007-10-30 20:09:25 UTC (rev 7725)
+++ branches/kde4/packages/kdelibs/debian/patches/series	2007-10-30 20:44:27 UTC (rev 7726)
@@ -1,2 +1,4 @@
 10_kdehome_kde4.diff
+11_kde4_applications_menu.diff
+12_deprecate_applnk.diff
 13_qt4_designer_plugins_path.diff