[SCM] muon packaging branch, kubuntu_stable, updated. fa2f8c52795ff47ce0263e2a8acb86a6d3fd460b

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_stable branch:
commit fa2f8c52795ff47ce0263e2a8acb86a6d3fd460b
Merge: fc56782120b3012d1c280683bc5ef5836760aece 270b5144d153f58c7c5662a73ff5e1e62e9174a3
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Thu Jun 4 03:28:29 2015 +0200

    merge

 debian/patches/series                                  |  5 -----
 debian/patches/upstream_init-application-notifier.diff | 12 ------------
 2 files changed, 17 deletions(-)

diff --cc debian/patches/upstream_init-application-notifier.diff
index 34d8bca,34d8bca..0000000
deleted file mode 100644,100644
--- a/debian/patches/upstream_init-application-notifier.diff
+++ /dev/null
@@@ -1,12 -1,12 +1,0 @@@
----- a/libmuon/backends/ApplicationBackend/ApplicationNotifier.cpp
--+++ b/libmuon/backends/ApplicationBackend/ApplicationNotifier.cpp
--@@ -55,6 +55,8 @@
-- 
--     //check in 2 minutes
--     QTimer::singleShot(2 * 60 * 1000, this, &ApplicationNotifier::recheckSystemUpdateNeeded);
--+
--+    init();
-- }
-- 
-- ApplicationNotifier::~ApplicationNotifier()
--

-- 
muon packaging