[SCM] KDE Discover packaging branch, kubuntu_wily_backports, updated. 785c1bd00c03889990f25b1bc6a373af093500e2

[Clive Johnston]

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

The following commit has been merged in the kubuntu_wily_backports branch:
commit 785c1bd00c03889990f25b1bc6a373af093500e2
Author: Clive Johnston <clivejo at aol.com>
Date:   Wed Jan 27 21:27:06 2016 +0000

    New upstream release & removing patches
    
    - Removing upstream_prevent_misleading_notification.diff
    - Removing upstream_fix_crash_on_pkglist_refresh.diff
    - Updating series file
---
 debian/patches/series                              |  2 --
 .../upstream_fix_crash_on_pkglist_refresh.diff     | 30 ----------------------
 .../upstream_prevent_misleading_notification.diff  | 29 ---------------------
 3 files changed, 61 deletions(-)

diff --git a/debian/patches/series b/debian/patches/series
index eb422fd..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +0,0 @@
-upstream_prevent_misleading_notification.diff
-upstream_fix_crash_on_pkglist_refresh.diff
diff --git a/debian/patches/upstream_fix_crash_on_pkglist_refresh.diff b/debian/patches/upstream_fix_crash_on_pkglist_refresh.diff
deleted file mode 100644
index 58a2876..0000000
--- a/debian/patches/upstream_fix_crash_on_pkglist_refresh.diff
+++ /dev/null
@@ -1,30 +0,0 @@
-From 811cca260f389271c330be43e068aa70f7165ba7 Mon Sep 17 00:00:00 2001
-From: Aleix Pol <aleixpol at kde.org>
-Date: Thu, 14 Jan 2016 15:43:51 +0100
-Subject: [PATCH 1/2] Fix crash
-
-Makes sure that we don't update the state twice in a row. Otherwise
-we'd have a crash on the null pointer.
-
-BUG: 357791
----
- libdiscover/backends/ApplicationBackend/ApplicationNotifier.cpp | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/libdiscover/backends/ApplicationBackend/ApplicationNotifier.cpp b/libdiscover/backends/ApplicationBackend/ApplicationNotifier.cpp
-index 566b7fb..25abc99 100644
---- a/libdiscover/backends/ApplicationBackend/ApplicationNotifier.cpp
-+++ b/libdiscover/backends/ApplicationBackend/ApplicationNotifier.cpp
-@@ -118,6 +118,9 @@ void ApplicationNotifier::recheckSystemUpdateNeeded()
-     
- void ApplicationNotifier::parseUpdateInfo()
- {
-+    if (!m_updateCheckerProcess)
-+        return;
-+
- #warning why does this parse stdout and not use qapt, wtf...
-     m_securityUpdates = 0;
-     m_normalUpdates = 0;
--- 
-2.1.4
-
diff --git a/debian/patches/upstream_prevent_misleading_notification.diff b/debian/patches/upstream_prevent_misleading_notification.diff
deleted file mode 100644
index 4ef28a8..0000000
--- a/debian/patches/upstream_prevent_misleading_notification.diff
+++ /dev/null
@@ -1,29 +0,0 @@
-From 2ccd19a67fbd716093b31cf60bcd7c5c3643c960 Mon Sep 17 00:00:00 2001
-From: Aleix Pol <aleixpol at kde.org>
-Date: Thu, 14 Jan 2016 15:56:43 +0100
-Subject: [PATCH 2/2] Prevent misleading notification
-
-BUG: 357613
----
- notifier/DiscoverNotifier.cpp | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/notifier/DiscoverNotifier.cpp b/notifier/DiscoverNotifier.cpp
-index 4e803a8..acf93b0 100644
---- a/notifier/DiscoverNotifier.cpp
-+++ b/notifier/DiscoverNotifier.cpp
-@@ -73,6 +73,11 @@ bool DiscoverNotifier::isSystemUpToDate() const
- 
- void DiscoverNotifier::showUpdatesNotification()
- {
-+    if (state()==NoUpdates) {
-+        //it's not very helpful to notify that everyting is in order
-+        return;
-+    }
-+
-     //TODO: Better message strings
-     QString msg = message();
-     if (m_verbose) {
--- 
-2.1.4
-

-- 
KDE Discover packaging