[SCM] kservice packaging branch, kubuntu_wily_archive, updated. debian/5.9.0-1-3-g0a6b8fe

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_wily_archive branch:
commit d680672604263e93e396606f74f3c9a90e5c24f5
Author: Harald Sitter <sitter at kde.org>
Date:   Fri Jan 23 09:21:32 2015 +0100

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

diff --git a/debian/patches/kubuntu_rename-application-menu-file.diff b/debian/patches/kubuntu_rename-application-menu-file.diff
index a92aaf7..9c7978c 100644
--- a/debian/patches/kubuntu_rename-application-menu-file.diff
+++ b/debian/patches/kubuntu_rename-application-menu-file.diff
@@ -23,8 +23,8 @@ Index: kservice/src/kbuildsycoca/kbuildsycoca.cpp
              g_vfolder->setTrackId(m_trackId);
          }
  
--        VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("applications.menu");
-+        VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("kf5-applications.menu");
+-        VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu(QStringLiteral("applications.menu"));
++        VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu(QStringLiteral("kf5-applications.menu"));
  
-         KServiceGroup::Ptr entry = g_buildServiceGroupFactory->addNew("/", kdeMenu->directoryFile, KServiceGroup::Ptr(), false);
+         KServiceGroup::Ptr entry = g_buildServiceGroupFactory->addNew(QStringLiteral("/"), kdeMenu->directoryFile, KServiceGroup::Ptr(), false);
          entry->setLayoutInfo(kdeMenu->layoutList);

-- 
kservice packaging