[SCM] KDE Base Workspace module packaging branch, master, updated. debian/4.8.4-2-4-gb082a1d

[Pino Toscano]

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

The following commit has been merged in the master branch:
commit b082a1db62cd5d32a6e0e3bb44da12c5cd5bf639
Author: Pino Toscano <pino at debian.org>
Date:   Mon Jun 25 14:48:09 2012 +0200

    sort the plasma-desktop init .js scripts
    
    backport upstream commit b798928ac8b9c6acf804b5cd4101d8a2a860654a
---
 debian/changelog                                   |    3 ++
 debian/patches/series                              |    1 +
 ...eam_make-sure-scripts-are-executed-sorted.patch |   25 ++++++++++++++++++++
 3 files changed, 29 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 65fc1f7..0795d8f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ kde-workspace (4:4.8.4-3) UNRELEASED; urgency=low
   [ Pino Toscano ]
   * Fix build failure on Hurd; patch hurd.diff.
   * Remove a couple of double spaces in control.
+  * Backport upstream commit b798928ac8b9c6acf804b5cd4101d8a2a860654a to sort
+    the plasma-desktop init .js scripts;
+    patch upstream_make-sure-scripts-are-executed-sorted.patch.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 11 Jun 2012 13:03:28 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
index 8738c97..162de01 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -21,3 +21,4 @@ process_table_unclickable.diff
 new_beams_custom_plots.diff
 relax_kdelibs_dependency.diff
 hurd.diff
+upstream_make-sure-scripts-are-executed-sorted.patch
diff --git a/debian/patches/upstream_make-sure-scripts-are-executed-sorted.patch b/debian/patches/upstream_make-sure-scripts-are-executed-sorted.patch
new file mode 100644
index 0000000..b3c6740
--- /dev/null
+++ b/debian/patches/upstream_make-sure-scripts-are-executed-sorted.patch
@@ -0,0 +1,25 @@
+From b798928ac8b9c6acf804b5cd4101d8a2a860654a Mon Sep 17 00:00:00 2001
+From: Marco Martin <notmart at gmail.com>
+Date: Mon, 25 Jun 2012 14:37:08 +0200
+Subject: [PATCH] make sure scripts are executed sorted
+
+---
+ libs/plasmagenericshell/scripting/scriptengine.cpp |    2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/libs/plasmagenericshell/scripting/scriptengine.cpp b/libs/plasmagenericshell/scripting/scriptengine.cpp
+index 0fb2d38..777a56d 100644
+--- a/libs/plasmagenericshell/scripting/scriptengine.cpp
++++ b/libs/plasmagenericshell/scripting/scriptengine.cpp
+@@ -677,6 +677,8 @@ QStringList ScriptEngine::defaultLayoutScripts()
+ {
+     const QString appName = KGlobal::activeComponent().aboutData()->appName();
+     QStringList scripts = KGlobal::dirs()->findAllResources("data", appName + "/init/*.js");
++    scripts.sort();
++
+     QStringList scriptPaths;
+ 
+     if (scripts.isEmpty()) {
+-- 
+1.7.10
+

-- 
KDE Base Workspace module packaging