[SCM] kservice packaging branch, master, updated. debian/5.37.0-2-99-gbdfc711

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kservice.git;a=commitdiff;h=de26b63

The following commit has been merged in the master branch:
commit de26b631f641b0aa5e2e184443ff6970ed5e8b56
Author: Harald Sitter <sitter at kde.org>
Date:   Thu Sep 10 16:17:23 2015 +0200

    refresh patch
---
 debian/patches/kubuntu_rename-application-menu-file.diff | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/debian/patches/kubuntu_rename-application-menu-file.diff b/debian/patches/kubuntu_rename-application-menu-file.diff
index 9c7978c..f4aa32a 100644
--- a/debian/patches/kubuntu_rename-application-menu-file.diff
+++ b/debian/patches/kubuntu_rename-application-menu-file.diff
@@ -8,7 +8,7 @@ Index: kservice/src/kbuildsycoca/CMakeLists.txt
 ===================================================================
 --- kservice.orig/src/kbuildsycoca/CMakeLists.txt
 +++ kservice/src/kbuildsycoca/CMakeLists.txt
-@@ -32,5 +32,5 @@ install(TARGETS kbuildsycoca5 ${KF5_INST
+@@ -33,5 +33,5 @@ install(TARGETS kbuildsycoca5 ${KF5_INST
  if (WIN32)
  install( FILES applications.menu  DESTINATION  ${KDE_INSTALL_DATAROOTDIR}/xdg/menus )
  else ()
@@ -19,12 +19,12 @@ Index: kservice/src/kbuildsycoca/kbuildsycoca.cpp
 ===================================================================
 --- kservice.orig/src/kbuildsycoca/kbuildsycoca.cpp
 +++ kservice/src/kbuildsycoca/kbuildsycoca.cpp
-@@ -307,7 +307,7 @@ bool KBuildSycoca::build()
-             g_vfolder->setTrackId(m_trackId);
+@@ -272,7 +272,7 @@ bool KBuildSycoca::build()
+             m_vfolder->setTrackId(m_trackId);
          }
  
--        VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu(QStringLiteral("applications.menu"));
-+        VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu(QStringLiteral("kf5-applications.menu"));
+-        VFolderMenu::SubMenu *kdeMenu = m_vfolder->parseMenu(QStringLiteral("applications.menu"));
++        VFolderMenu::SubMenu *kdeMenu = m_vfolder->parseMenu(QStringLiteral("kf5-applications.menu"));
  
-         KServiceGroup::Ptr entry = g_buildServiceGroupFactory->addNew(QStringLiteral("/"), kdeMenu->directoryFile, KServiceGroup::Ptr(), false);
+         KServiceGroup::Ptr entry = m_buildServiceGroupFactory->addNew(QStringLiteral("/"), kdeMenu->directoryFile, KServiceGroup::Ptr(), false);
          entry->setLayoutInfo(kdeMenu->layoutList);

-- 
kservice packaging