[SCM] KDE Base Workspace module packaging branch, wheezy, updated. debian/4.8.4-4-6-ge574972

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kde-workspace.git;a=commitdiff;h=e574972

The following commit has been merged in the wheezy branch:
commit e5749722c6a8d178b8d989dd6fe66535c54a3891
Author: Pino Toscano <pino at debian.org>
Date:   Mon Oct 29 11:44:28 2012 +0100

    improve the sorting of init .js files
    
    followup of the changes backported in 4:4.8.4-3;
    backport upstream commit 5b35757fc3613a18e2d784af53d1d23ebe295028
---
 debian/changelog                                   |    4 ++
 debian/patches/series                              |    1 +
 ...he-plasma-desktop-scripts-are-sorted-in-t.patch |   51 ++++++++++++++++++++
 3 files changed, 56 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 59df5f0..599190a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,10 @@ kde-workspace (4:4.8.4-5) UNRELEASED; urgency=low
     53f6eca921a44a1f5e567b92d45ea84599afea74 to make powermanagementprofilesrc
     read as cascading config, and 9994e178b790b03a464c335e624366f82f0da643 for
     kwinrc.
+  * Backport upstream commit 5b35757fc3613a18e2d784af53d1d23ebe295028 to
+    improve the sorting of init .js files (followup of the changes backported
+    in 4:4.8.4-3 with upstream_make-sure-scripts-are-executed-sorted.patch);
+    patch upstream_Make-sure-the-plasma-desktop-scripts-are-sorted-in-t.patch.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 24 Oct 2012 17:06:28 -0300
 
diff --git a/debian/patches/series b/debian/patches/series
index 6436640..fb509f1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -27,3 +27,4 @@ upstream_Check-if-attention-demanding-status-has-changed-when.patch
 upstream_Use-the-CascadeConfig-flag-as-this-allows-the-KCM-to.patch
 upstream_Use-cascaded-configs-for-other-modules-as-well.patch
 upstream_Fix-the-kwin-KCM-to-read-cascaded-configs.patch
+upstream_Make-sure-the-plasma-desktop-scripts-are-sorted-in-t.patch
diff --git a/debian/patches/upstream_Make-sure-the-plasma-desktop-scripts-are-sorted-in-t.patch b/debian/patches/upstream_Make-sure-the-plasma-desktop-scripts-are-sorted-in-t.patch
new file mode 100644
index 0000000..f924eb0
--- /dev/null
+++ b/debian/patches/upstream_Make-sure-the-plasma-desktop-scripts-are-sorted-in-t.patch
@@ -0,0 +1,51 @@
+From 5b35757fc3613a18e2d784af53d1d23ebe295028 Mon Sep 17 00:00:00 2001
+From: Rohan Garg <rohangarg at kubuntu.org>
+Date: Fri, 31 Aug 2012 15:21:11 +0530
+Subject: [PATCH] Make sure the plasma desktop scripts are sorted in the
+ correct order
+
+Instead of sorting the scripts according to their absolute paths,
+which would cause scripts installed by packages to always end at
+the top, scripts should be sorted by their relative path i.e.
+plasma scripts from each directory that occurs in the path
+should be sorted and then merged together to form a super list
+
+REVIEWED BY: Marco Martin
+---
+ libs/plasmagenericshell/scripting/scriptengine.cpp |   20 ++++++++++++++++++--
+ 1 file changed, 18 insertions(+), 2 deletions(-)
+
+diff --git a/libs/plasmagenericshell/scripting/scriptengine.cpp b/libs/plasmagenericshell/scripting/scriptengine.cpp
+index 777a56d..7810ab4 100644
+--- a/libs/plasmagenericshell/scripting/scriptengine.cpp
++++ b/libs/plasmagenericshell/scripting/scriptengine.cpp
+@@ -676,8 +676,24 @@ QStringList ScriptEngine::pendingUpdateScripts()
+ QStringList ScriptEngine::defaultLayoutScripts()
+ {
+     const QString appName = KGlobal::activeComponent().aboutData()->appName();
+-    QStringList scripts = KGlobal::dirs()->findAllResources("data", appName + "/init/*.js");
+-    scripts.sort();
++    QStringList appNameDirs = KGlobal::dirs()->findDirs("data", appName);
++    QStringList scripts;
++    QDir appDir;
++    QFileInfoList scriptList;
++
++    foreach (const QString &appNameDir, appNameDirs) {
++        appDir.setPath(appNameDir + QLatin1String("init/"));
++        if (appDir.exists()) {
++            scriptList = appDir.entryInfoList(QStringList("*.js"),
++                                            QDir::NoFilter,
++                                            QDir::Name);
++            foreach (const QFileInfo &script, scriptList) {
++                if (script.exists()) {
++                    scripts.append(script.absoluteFilePath());
++                }
++            }
++        }
++    }
+ 
+     QStringList scriptPaths;
+ 
+-- 
+1.7.10.4
+

-- 
KDE Base Workspace module packaging