[SCM] kservice packaging branch, master, updated. debian/5.14.3-1-8-g94d847f

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 7a7a5f336ac2fb5d5ce138fe2e497b9496f76582
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Tue Oct 6 16:11:59 2015 +0200

    Drop patch: kubuntu_rename-application-menu-file.diff
---
 debian/changelog                                   |  1 +
 .../kubuntu_rename-application-menu-file.diff      | 30 ----------------------
 debian/patches/series                              |  1 -
 3 files changed, 1 insertion(+), 31 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7b98823..e5f590c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ kservice (5.15.0-1~) UNRELEASED; urgency=medium
 
   * New upstream release (5.15.0).
   * Update symbols files from buildds logs (5.14.3-1).
+  * Drop patch: kubuntu_rename-application-menu-file.diff
 
  -- Maximiliano Curia <maxy at debian.org>  Mon, 05 Oct 2015 15:08:12 +0200
 
diff --git a/debian/patches/kubuntu_rename-application-menu-file.diff b/debian/patches/kubuntu_rename-application-menu-file.diff
deleted file mode 100644
index 4d05bc4..0000000
--- a/debian/patches/kubuntu_rename-application-menu-file.diff
+++ /dev/null
@@ -1,30 +0,0 @@
-Description: Rename applications.menu file to prevent it clashing with
-other desktops.  Longstanding issue with XDG menu spec which is
-deliberately not changed so unable to forward upstream.
-Forwarded: not-needed
-Author: Jonathan Riddell <jr at jriddell.org>
-
-Index: kservice/src/kbuildsycoca/CMakeLists.txt
-===================================================================
---- 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 ()
--install( FILES applications.menu  DESTINATION  ${KDE_INSTALL_SYSCONFDIR}/xdg/menus )
-+install( FILES applications.menu  DESTINATION  ${KDE_INSTALL_SYSCONFDIR}/xdg/menus RENAME kf5-applications.menu )
- endif ()
-Index: kservice/src/kbuildsycoca/kbuildsycoca.cpp
-===================================================================
---- 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 = m_vfolder->parseMenu(QStringLiteral("applications.menu"));
-+        VFolderMenu::SubMenu *kdeMenu = m_vfolder->parseMenu(QStringLiteral("kf5-applications.menu"));
- 
-         KServiceGroup::Ptr entry = m_buildServiceGroupFactory->addNew(QStringLiteral("/"), kdeMenu->directoryFile, KServiceGroup::Ptr(), false);
-         entry->setLayoutInfo(kdeMenu->layoutList);
diff --git a/debian/patches/series b/debian/patches/series
index 05a85e7..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +0,0 @@
-kubuntu_rename-application-menu-file.diff

-- 
kservice packaging