[SCM] kservice packaging branch, master, updated. debian/5.13.0-2-4-g0142f59

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 5a086c05baed127a80af76b0c1c06b1c7ff06ce6
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Mon Sep 14 11:42:36 2015 +0200

    Refresh patches.
---
 debian/changelog                                     |  1 +
 .../kubuntu_rename-application-menu-file.diff        | 20 ++++++++++----------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7f6aca5..3142a4a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 kservice (5.14.0-1~) UNRELEASED; urgency=medium
 
   * New upstream release (5.14.0).
+  * Refresh patches.
 
  -- Maximiliano Curia <maxy at debian.org>  Mon, 14 Sep 2015 00:30:24 +0200
 
diff --git a/debian/patches/kubuntu_rename-application-menu-file.diff b/debian/patches/kubuntu_rename-application-menu-file.diff
index 9c7978c..4d05bc4 100644
--- a/debian/patches/kubuntu_rename-application-menu-file.diff
+++ b/debian/patches/kubuntu_rename-application-menu-file.diff
@@ -6,9 +6,9 @@ Author: Jonathan Riddell <jr at jriddell.org>
 
 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
+--- kservice.orig/src/kbuildsycoca/CMakeLists.txt	2015-09-14 11:38:44.078463238 +0200
++++ kservice/src/kbuildsycoca/CMakeLists.txt	2015-09-14 11:38:44.074463397 +0200
+@@ -32,5 +32,5 @@
  if (WIN32)
  install( FILES applications.menu  DESTINATION  ${KDE_INSTALL_DATAROOTDIR}/xdg/menus )
  else ()
@@ -17,14 +17,14 @@ Index: kservice/src/kbuildsycoca/CMakeLists.txt
  endif ()
 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);
+--- kservice.orig/src/kbuildsycoca/kbuildsycoca.cpp	2015-09-14 11:38:44.078463238 +0200
++++ kservice/src/kbuildsycoca/kbuildsycoca.cpp	2015-09-14 11:39:51.651771116 +0200
+@@ -301,7 +301,7 @@
+             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