rev 17988 - in trunk/packages/kdelibs/debian: . patches

[Modestas Vainius]

Author: modax
Date: 2010-05-15 19:39:00 +0000 (Sat, 15 May 2010)
New Revision: 17988

Added:
   trunk/packages/kdelibs/debian/patches/00_4.4.3_final_tarball.diff
Modified:
   trunk/packages/kdelibs/debian/changelog
   trunk/packages/kdelibs/debian/patches/series
Log:
Bring our 4.4.3 up-to-date with final upstream 4.4.3 tarball
(patch 00_4.4.3_final_tarball.diff).

Modified: trunk/packages/kdelibs/debian/changelog
===================================================================
--- trunk/packages/kdelibs/debian/changelog	2010-05-15 10:39:51 UTC (rev 17987)
+++ trunk/packages/kdelibs/debian/changelog	2010-05-15 19:39:00 UTC (rev 17988)
@@ -2,6 +2,8 @@
 
   * Confirm symbol files for 4.4.3 on all arches except alpha.
   * Restore kdelibs5-dev installability with libkwebkit-dev (>= 0.9svn1123738).
+  * Bring our 4.4.3 up-to-date with final upstream 4.4.3 tarball
+    (patch 00_4.4.3_final_tarball.diff).
 
  -- Modestas Vainius <modax at debian.org>  Tue, 04 May 2010 11:17:33 +0300
 

Added: trunk/packages/kdelibs/debian/patches/00_4.4.3_final_tarball.diff
===================================================================
--- trunk/packages/kdelibs/debian/patches/00_4.4.3_final_tarball.diff	                        (rev 0)
+++ trunk/packages/kdelibs/debian/patches/00_4.4.3_final_tarball.diff	2010-05-15 19:39:00 UTC (rev 17988)
@@ -0,0 +1,21 @@
+Description: diff against final 4.4.3 tarball of kdelibs
+Origin: upstream
+
+--- a/plasma/applet.cpp
++++ b/plasma/applet.cpp
+@@ -2585,8 +2585,13 @@ void AppletPrivate::init(const QString &
+         // find where the Package is
+         QString path = packagePath;
+         if (path.isEmpty()) {
+-            path = KStandardDirs::locate("data", "plasma/plasmoids/" + appletDescription.pluginName() + "/metadata.desktop");
+-            path.replace(QString("/metadata.desktop"),QString("/"));
++            QString subPath = q->packageStructure()->defaultPackageRoot() + '/' + appletDescription.pluginName() + '/';
++            path = KStandardDirs::locate("data", subPath + "metadata.desktop");
++            if (path.isEmpty()) {
++                path = KStandardDirs::locate("data", subPath);
++            } else {
++                path.remove(QString("metadata.desktop"));
++            }
+         } else if (!path.endsWith('/')) {
+             path.append('/');
+         }

Modified: trunk/packages/kdelibs/debian/patches/series
===================================================================
--- trunk/packages/kdelibs/debian/patches/series	2010-05-15 10:39:51 UTC (rev 17987)
+++ trunk/packages/kdelibs/debian/patches/series	2010-05-15 19:39:00 UTC (rev 17988)
@@ -1,3 +1,4 @@
+00_4.4.3_final_tarball.diff
 08_add_debian_build_type.diff
 09_disable_usr_lib_install_rpath.diff
 10_make_libkdeinit4_private.diff