rev 12729 - in branches/kde4/packages/kdelibs/debian: . patches
Modestas Vainius
modax-guest at alioth.debian.org
Tue Nov 25 00:40:36 UTC 2008
Author: modax-guest
Date: 2008-11-25 00:40:36 +0000 (Tue, 25 Nov 2008)
New Revision: 12729
Added:
branches/kde4/packages/kdelibs/debian/patches/11_default_kde4_xdg_menu_prefix.diff
Removed:
branches/kde4/packages/kdelibs/debian/patches/11_kde4_applications_menu.diff
Modified:
branches/kde4/packages/kdelibs/debian/changelog
branches/kde4/packages/kdelibs/debian/patches/series
Log:
The patch seems to work well
Modified: branches/kde4/packages/kdelibs/debian/changelog
===================================================================
--- branches/kde4/packages/kdelibs/debian/changelog 2008-11-24 23:14:16 UTC (rev 12728)
+++ branches/kde4/packages/kdelibs/debian/changelog 2008-11-25 00:40:36 UTC (rev 12729)
@@ -1,3 +1,15 @@
+kde4libs (4:4.1.3-3) UNRELEASED; urgency=low
+
+ +++ Changes by Modestas Vainius:
+
+ * Use better approach to enforcing kde4- prefix to applications.menu. The
+ previous way broken menu spec and made 3rd party applications end up in.
+ Lost&Found menu. 11_kde4_applications_menu.diff patch was replaced by
+ 11_default_kde4_xdg_menu_prefix.diff. Thanks to Harald Sitter for the
+ heads up.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Tue, 25 Nov 2008 00:21:43 +0200
+
kde4libs (4:4.1.3-2) experimental; urgency=low
+++ Changes by Modestas Vainius:
Added: branches/kde4/packages/kdelibs/debian/patches/11_default_kde4_xdg_menu_prefix.diff
===================================================================
--- branches/kde4/packages/kdelibs/debian/patches/11_default_kde4_xdg_menu_prefix.diff (rev 0)
+++ branches/kde4/packages/kdelibs/debian/patches/11_default_kde4_xdg_menu_prefix.diff 2008-11-25 00:40:36 UTC (rev 12729)
@@ -0,0 +1,34 @@
+--- a/kded/CMakeLists.txt
++++ b/kded/CMakeLists.txt
+@@ -67,7 +67,7 @@
+
+ ########### install files ###############
+
+-install( FILES applications.menu DESTINATION ${SYSCONF_INSTALL_DIR}/xdg/menus )
++install( FILES applications.menu DESTINATION ${SYSCONF_INSTALL_DIR}/xdg/menus RENAME kde4-applications.menu)
+ install( FILES kdedmodule.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} )
+ install( FILES kded.upd DESTINATION ${DATA_INSTALL_DIR}/kconf_update )
+
+--- a/kded/vfolder_menu.cpp
++++ b/kded/vfolder_menu.cpp
+@@ -771,8 +771,10 @@
+ QString result;
+
+ QString xdgMenuPrefix = QString::fromLocal8Bit(qgetenv("XDG_MENU_PREFIX"));
+- if (!xdgMenuPrefix.isEmpty())
+- {
++ // enforce kde4 prefix unless XDG_MENU_PREFIX is set (LP: #297195)
++ if (xdgMenuPrefix.isEmpty())
++ xdgMenuPrefix = QString("kde4-");
++
+ QFileInfo fileInfo(fileName);
+
+ QString fileNameOnly = fileInfo.fileName();
+@@ -782,7 +784,6 @@
+ QString baseName = QDir::cleanPath(m_docInfo.baseDir +
+ fileInfo.path() + '/' + fileNameOnly);
+ result = KStandardDirs::locate("xdgconf-menu", baseName);
+- }
+
+ if (result.isEmpty())
+ {
Deleted: branches/kde4/packages/kdelibs/debian/patches/11_kde4_applications_menu.diff
Modified: branches/kde4/packages/kdelibs/debian/patches/series
===================================================================
--- branches/kde4/packages/kdelibs/debian/patches/series 2008-11-24 23:14:16 UTC (rev 12728)
+++ branches/kde4/packages/kdelibs/debian/patches/series 2008-11-25 00:40:36 UTC (rev 12729)
@@ -2,7 +2,7 @@
01_kross_version_11_r838337.diff
08_add_debian_build_type.diff
09_disable_debug_messages_if_not_explicitly_enabled.diff
-11_kde4_applications_menu.diff
+11_default_kde4_xdg_menu_prefix.diff
13_qt4_designer_plugins_path.diff
14_hardcode_ptm_device.diff
15_kfreebsd_support.diff
More information about the pkg-kde-commits
mailing list