[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=36dae73

The following commit has been merged in the kubuntu_wily_archive branch:
commit 36dae731cdf6de88f192723d716228fa62f9b3e3
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Tue Jan 27 13:28:18 2015 +0100

    Refresh patches.
---
 debian/changelog                                   |  1 +
 .../kubuntu_rename-application-menu-file.diff      | 25 +++++++++++-----------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5152be3..dac438a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ kservice (5.6.0-1~) UNRELEASED; urgency=medium
   * Update install files.
   * Update watch file.
   * Add acc autopkgtests.
+  * Refresh patches.
 
  -- Maximiliano Curia <maxy at debian.org>  Tue, 27 Jan 2015 11:06:10 +0100
 
diff --git a/debian/patches/kubuntu_rename-application-menu-file.diff b/debian/patches/kubuntu_rename-application-menu-file.diff
index 9c7978c..538571d 100644
--- a/debian/patches/kubuntu_rename-application-menu-file.diff
+++ b/debian/patches/kubuntu_rename-application-menu-file.diff
@@ -6,25 +6,26 @@ 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-01-27 13:25:04.674067679 +0100
++++ kservice/src/kbuildsycoca/CMakeLists.txt	2015-01-27 13:26:08.679482651 +0100
+@@ -32,5 +32,6 @@
  if (WIN32)
- install( FILES applications.menu  DESTINATION  ${KDE_INSTALL_DATAROOTDIR}/xdg/menus )
+ install( FILES applications.menu  DESTINATION  ${SHARE_INSTALL_PREFIX}/xdg/menus )
  else ()
--install( FILES applications.menu  DESTINATION  ${KDE_INSTALL_SYSCONFDIR}/xdg/menus )
-+install( FILES applications.menu  DESTINATION  ${KDE_INSTALL_SYSCONFDIR}/xdg/menus RENAME kf5-applications.menu )
+-install( FILES applications.menu  DESTINATION  ${SYSCONF_INSTALL_DIR}/xdg/menus )
++install( FILES applications.menu  DESTINATION ${SYSCONF_INSTALL_DIR}/xdg/menus
++   RENAME kf5-applications.menu )
  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()
+--- kservice.orig/src/kbuildsycoca/kbuildsycoca.cpp	2015-01-27 13:25:04.674067679 +0100
++++ kservice/src/kbuildsycoca/kbuildsycoca.cpp	2015-01-27 13:26:53.309680112 +0100
+@@ -307,7 +307,7 @@
              g_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 = g_vfolder->parseMenu("applications.menu");
++        VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("kf5-applications.menu");
  
-         KServiceGroup::Ptr entry = g_buildServiceGroupFactory->addNew(QStringLiteral("/"), kdeMenu->directoryFile, KServiceGroup::Ptr(), false);
+         KServiceGroup::Ptr entry = g_buildServiceGroupFactory->addNew("/", kdeMenu->directoryFile, KServiceGroup::Ptr(), false);
          entry->setLayoutInfo(kdeMenu->layoutList);

-- 
kservice packaging