[SCM] plasma-desktop packaging branch, kubuntu_wily_archive, updated. ubuntu/4%5.4.2-0ubuntu1-1-gd86f972

[Jonathan Riddell]

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

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

    Add 0001-add-discover-to-favorties.patch from upstream to add Muon favourites
---
 debian/changelog                                   |  7 ++++++
 .../patches/0001-add-discover-to-favorties.patch   | 29 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 37 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 006da87..d73da35 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+plasma-desktop (4:5.4.2-0ubuntu2) wily; urgency=medium
+
+  * Add 0001-add-discover-to-favorties.patch from upstream to add Muon
+    favourites
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 05 Oct 2015 15:15:17 +0100
+
 plasma-desktop (4:5.4.2-0ubuntu1) wily; urgency=medium
 
   * New upstream release
diff --git a/debian/patches/0001-add-discover-to-favorties.patch b/debian/patches/0001-add-discover-to-favorties.patch
new file mode 100644
index 0000000..1d16e51
--- /dev/null
+++ b/debian/patches/0001-add-discover-to-favorties.patch
@@ -0,0 +1,29 @@
+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
new file mode 100644
index 0000000..ed673fa
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-add-discover-to-favorties.patch

-- 
plasma-desktop packaging