[SCM] plasma-desktop packaging branch, master, updated. 3a008c7c6b669f2fd617ac895f1dc03658edceef

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/plasma-desktop.git;a=commitdiff;h=a7c5ae4

The following commit has been merged in the master branch:
commit a7c5ae4109920517ac330d6a3e7c2545d4e63880
Author: Harald Sitter <sitter at kde.org>
Date:   Thu Nov 6 22:01:59 2014 +0100

    drop upstream patch
---
 debian/patches/series                              |  1 -
 .../upstream_default-kickoff-applications.diff     | 32 ----------------------
 2 files changed, 33 deletions(-)

diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index f118cab..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-upstream_default-kickoff-applications.diff
diff --git a/debian/patches/upstream_default-kickoff-applications.diff b/debian/patches/upstream_default-kickoff-applications.diff
deleted file mode 100644
index 32d4c07..0000000
--- a/debian/patches/upstream_default-kickoff-applications.diff
+++ /dev/null
@@ -1,32 +0,0 @@
-Author: Jonathan Riddell <jr at jriddell.org>
-Date:   Thu Oct 9 10:35:49 2014 +0200
-Description: Update default applications in kickoff
-    instead of defaulting to konqueror find the first browser from a list
-    change konsole to ktp-contactlist, we want to appeal to non geeks
-    change kmail for kontact, we provide a lovely PIM suite so we should show it by default
-Forwarded: https://git.reviewboard.kde.org/r/120538/
-
-diff --git a/applets/kickoff/core/favoritesmodel.cpp b/applets/kickoff/core/favoritesmodel.cpp
-index e26cf80..e1d3a71 100644
---- a/applets/kickoff/core/favoritesmodel.cpp
-+++ b/applets/kickoff/core/favoritesmodel.cpp
-@@ -109,7 +109,18 @@ public:
-     static QList<QString> defaultFavorites()
-     {
-         QList<QString> applications;
--        applications << "konqbrowser" << "KMail2" << "systemsettings" << "dolphin" << "org.kde.konsole" << "org.kde.kwrite";
-+
-+        QList<QString> browsers;
-+        browsers << "konqbrowser" << "rekonq" << "firefox" << "chromium-browser" << "google-chrome";
-+        foreach (const QString& browser, browsers) {
-+            KService::Ptr service = KService::serviceByStorageId(browser + ".desktop");
-+            if (service) {
-+                applications << browser;
-+                break;
-+            }
-+        }
-+
-+        applications << "kontact" << "systemsettings" << "dolphin" << "ktp-contactlist" << "kwrite";
- 
-         QList<QString> desktopFiles;
- 

-- 
plasma-desktop packaging