[SCM] kservice packaging branch, kubuntu_wily_archive, updated. debian/5.9.0-1-3-g0a6b8fe
Jonathan Riddell
jriddell-guest at moszumanska.debian.org
Tue May 19 13:01:17 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kservice.git;a=commitdiff;h=12f933f
The following commit has been merged in the kubuntu_wily_archive branch:
commit 12f933f737ae6624e73bd71def172532c90d6b5d
Author: Harald Sitter <sitter at kde.org>
Date: Sun Jan 11 17:47:24 2015 +0100
update patch
---
.../kubuntu_rename-application-menu-file.diff | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/debian/patches/kubuntu_rename-application-menu-file.diff b/debian/patches/kubuntu_rename-application-menu-file.diff
index 808d307..a92aaf7 100644
--- a/debian/patches/kubuntu_rename-application-menu-file.diff
+++ b/debian/patches/kubuntu_rename-application-menu-file.diff
@@ -4,22 +4,22 @@ deliberately not changed so unable to forward upstream.
Forwarded: not-needed
Author: Jonathan Riddell <jr at jriddell.org>
-Index: kservice-4.100.0/src/kbuildsycoca/CMakeLists.txt
+Index: kservice/src/kbuildsycoca/CMakeLists.txt
===================================================================
---- kservice-4.100.0.orig/src/kbuildsycoca/CMakeLists.txt
-+++ kservice-4.100.0/src/kbuildsycoca/CMakeLists.txt
+--- kservice.orig/src/kbuildsycoca/CMakeLists.txt
++++ kservice/src/kbuildsycoca/CMakeLists.txt
@@ -32,5 +32,5 @@ install(TARGETS kbuildsycoca5 ${KF5_INST
if (WIN32)
- install( FILES applications.menu DESTINATION ${SHARE_INSTALL_PREFIX}/xdg/menus )
+ install( FILES applications.menu DESTINATION ${KDE_INSTALL_DATAROOTDIR}/xdg/menus )
else ()
--install( FILES applications.menu DESTINATION ${SYSCONF_INSTALL_DIR}/xdg/menus )
-+install( FILES applications.menu DESTINATION ${SYSCONF_INSTALL_DIR}/xdg/menus RENAME kf5-applications.menu )
+-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-4.100.0/src/kbuildsycoca/kbuildsycoca.cpp
+Index: kservice/src/kbuildsycoca/kbuildsycoca.cpp
===================================================================
---- kservice-4.100.0.orig/src/kbuildsycoca/kbuildsycoca.cpp
-+++ kservice-4.100.0/src/kbuildsycoca/kbuildsycoca.cpp
-@@ -305,7 +305,7 @@ bool KBuildSycoca::build()
+--- kservice.orig/src/kbuildsycoca/kbuildsycoca.cpp
++++ kservice/src/kbuildsycoca/kbuildsycoca.cpp
+@@ -307,7 +307,7 @@ bool KBuildSycoca::build()
g_vfolder->setTrackId(m_trackId);
}
--
kservice packaging
More information about the pkg-kde-commits
mailing list