[SCM] KDE Base Workspace module packaging branch, master, updated. debian/4.8.4-3-9-g0c8e2d3

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit 6a21bf03eb6744190f753b263e8eb48fb0278e6c
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Sun Sep 30 17:45:17 2012 -0300

    Remove upstream_make-sure-scripts-are-executed-sorted.patch.
    
    Already applied upstream.
---
 debian/changelog                                   |    1 +
 debian/patches/series                              |    1 -
 ...eam_make-sure-scripts-are-executed-sorted.patch |   25 --------------------
 3 files changed, 1 insertions(+), 26 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index fa40738..22c3aa3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ kde-workspace (4:4.8.5-0r0) UNRELEASED; urgency=low
   * Remove patches already applied upstream.
     - process_table_unclickable.diff.
     - new_beams_custom_plots.diff.
+    - upstream_make-sure-scripts-are-executed-sorted.patch.
   * Refresh relax_kdelibs_dependency.diff.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 15 Aug 2012 11:34:25 +0200
diff --git a/debian/patches/series b/debian/patches/series
index f0acc0d..516d5b0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -19,5 +19,4 @@ kdm_vt_switching_on_kfreebsd.diff
 nlist_ftbfs_krefreebsd.diff
 relax_kdelibs_dependency.diff
 hurd.diff
-upstream_make-sure-scripts-are-executed-sorted.patch
 upstream_centralize-interaction-notification-handling.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
deleted file mode 100644
index b3c6740..0000000
--- a/debian/patches/upstream_make-sure-scripts-are-executed-sorted.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-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