rev 13357 - in branches/kde4-backports/packages/kdelibs/debian: . patches

[Ana Beatriz Guerrero López]

Author: ana
Date: 2009-01-15 00:39:06 +0000 (Thu, 15 Jan 2009)
New Revision: 13357

Added:
   branches/kde4-backports/packages/kdelibs/debian/patches/11_default_kde4_xdg_menu_prefix.diff
Removed:
   branches/kde4-backports/packages/kdelibs/debian/patches/01_http_cache_cleaner_branch_881252.diff
   branches/kde4-backports/packages/kdelibs/debian/patches/11_kde4_applications_menu.diff
Modified:
   branches/kde4-backports/packages/kdelibs/debian/changelog
   branches/kde4-backports/packages/kdelibs/debian/patches/series
   branches/kde4-backports/packages/kdelibs/debian/rules
Log:
kde4libs 4.1.4 backport


Modified: branches/kde4-backports/packages/kdelibs/debian/changelog
===================================================================
--- branches/kde4-backports/packages/kdelibs/debian/changelog	2009-01-14 23:00:05 UTC (rev 13356)
+++ branches/kde4-backports/packages/kdelibs/debian/changelog	2009-01-15 00:39:06 UTC (rev 13357)
@@ -1,10 +1,28 @@
-kde4libs (4:4.1.3-2~lenny+1) lenny; urgency=low
+kde4libs (4:4.1.4-1~lenny+1) lenny; urgency=low
 
   * Backport for Lenny.
-  * Using UPSTREAMVERSION ?= 4:4.1.3-2~lenny+1 instead of 4:4.1.3-2.
+  * Using UPSTREAMVERSION ?= 4:4.1.4-1~lenny+1 instead of 4:4.1.4-1.
 
- -- Ana Beatriz Guerrero Lopez <ana at debian.org>  Mon, 17 Nov 2008 13:47:53 +0100
+ -- Ana Beatriz Guerrero Lopez <ana at debian.org>  Thu, 15 Jan 2009 01:18:14 +0100
 
+kde4libs (4:4.1.4-1) experimental; urgency=low
+
+  * New upstream release.
+
+  +++ Changes by Sune Vuorela:
+
+  * shlibs bump.
+
+  +++ 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>  Fri, 09 Jan 2009 22:00:46 +0100
+
 kde4libs (4:4.1.3-2) experimental; urgency=low
 
   +++ Changes by Modestas Vainius:

Deleted: branches/kde4-backports/packages/kdelibs/debian/patches/01_http_cache_cleaner_branch_881252.diff

Copied: branches/kde4-backports/packages/kdelibs/debian/patches/11_default_kde4_xdg_menu_prefix.diff (from rev 13356, branches/kde4/packages/kdelibs/debian/patches/11_default_kde4_xdg_menu_prefix.diff)
===================================================================
--- branches/kde4-backports/packages/kdelibs/debian/patches/11_default_kde4_xdg_menu_prefix.diff	                        (rev 0)
+++ branches/kde4-backports/packages/kdelibs/debian/patches/11_default_kde4_xdg_menu_prefix.diff	2009-01-15 00:39:06 UTC (rev 13357)
@@ -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
+@@ -775,8 +775,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();
+@@ -786,7 +788,6 @@
+       QString baseName = QDir::cleanPath(m_docInfo.baseDir +
+                                          fileInfo.path() + '/' + fileNameOnly);
+       result = KStandardDirs::locate("xdgconf-menu", baseName);
+-   }
+ 
+    if (result.isEmpty())
+    {

Deleted: branches/kde4-backports/packages/kdelibs/debian/patches/11_kde4_applications_menu.diff

Modified: branches/kde4-backports/packages/kdelibs/debian/patches/series
===================================================================
--- branches/kde4-backports/packages/kdelibs/debian/patches/series	2009-01-14 23:00:05 UTC (rev 13356)
+++ branches/kde4-backports/packages/kdelibs/debian/patches/series	2009-01-15 00:39:06 UTC (rev 13357)
@@ -1,8 +1,7 @@
-01_http_cache_cleaner_branch_881252.diff
 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

Modified: branches/kde4-backports/packages/kdelibs/debian/rules
===================================================================
--- branches/kde4-backports/packages/kdelibs/debian/rules	2009-01-14 23:00:05 UTC (rev 13356)
+++ branches/kde4-backports/packages/kdelibs/debian/rules	2009-01-15 00:39:06 UTC (rev 13357)
@@ -1,8 +1,8 @@
 #!/usr/bin/make -f
 
 #UPSTREAMVERSION ?= $(shell dpkg-parsechangelog | grep '^Version: ' | sed 's/^Version: \(.*\)-.*/\1/')
-UPSTREAMVERSION ?= 4:4.1.3-2~lenny+1
-RUNTIME_DEPS := kdebase-runtime (>= 4:4.1.3)
+UPSTREAMVERSION ?= 4:4.1.4-1~lenny+1
+RUNTIME_DEPS := kdebase-runtime (>= 4:4.1.4)
 
 DEB_DBG_PACKAGE_kdelibs5 := kdelibs5-dbg
 DEB_DBG_PACKAGE_kdelibs-bin := kdelibs5-dbg