[SCM] plasma-desktop packaging branch, kubuntu_stable, updated. ubuntu/4%5.4.2-0ubuntu1-2-gbd0b4a7

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_stable branch:
commit bd0b4a76e95677cc5edfa821408cdf066a132757
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Mon Oct 5 15:17:50 2015 +0100

    remove upstreamed patch
---
 .../patches/0001-add-discover-to-favorties.patch   | 29 ----------------------
 debian/patches/series                              |  1 -
 2 files changed, 30 deletions(-)

diff --git a/debian/patches/0001-add-discover-to-favorties.patch b/debian/patches/0001-add-discover-to-favorties.patch
deleted file mode 100644
index 1d16e51..0000000
--- a/debian/patches/0001-add-discover-to-favorties.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 6580689bbc3995d9b6d6eab5c2b1ba65ff07f01d Mon Sep 17 00:00:00 2001
-From: Harald Sitter <sitter at kde.org>
-Date: Thu, 10 Sep 2015 00:15:19 +0200
-Subject: [PATCH] add discover to favorties
-
-as requested by VDG
-
-REVIEW: 125127
----
- applets/kickoff/core/favoritesmodel.cpp | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/applets/kickoff/core/favoritesmodel.cpp b/applets/kickoff/core/favoritesmodel.cpp
-index ce49939..c2c0385 100644
---- a/applets/kickoff/core/favoritesmodel.cpp
-+++ b/applets/kickoff/core/favoritesmodel.cpp
-@@ -138,7 +138,8 @@ public:
-                       << "org.kde.systemsettings" << "systemsettings"
-                       << "org.kde.dolphin" << "dolphin"
-                       << "org.kde.ktpcontactlist" << "ktp-contactlist"
--                      << "org.kde.kate" << "kate";
-+                      << "org.kde.kate" << "kate"
-+                      << "org.kde.discover" << "muon-discover" << "discover";
- 
-         QList<QString> desktopFiles;
- 
--- 
-2.1.4
-
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index ed673fa..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-0001-add-discover-to-favorties.patch

-- 
plasma-desktop packaging