[SCM] muon packaging branch, kubuntu_unstable, updated. 3a6624d3904c266613212e1d6f8dc539e29b35fa

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_unstable branch:
commit 3a6624d3904c266613212e1d6f8dc539e29b35fa
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Thu Jun 4 02:57:39 2015 +0200

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

diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 1c58984..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,5 +0,0 @@
-upstream_check-for-KDELibs4Support.patch
-upstream_Change-Join-the-Game-url.patch
-upstream_Make-sure-the-proper-xmlgui-file-is-loaded.patch
-upstream_notifyrc-path.diff
-upstream_init-application-notifier.diff
diff --git a/debian/patches/upstream_init-application-notifier.diff b/debian/patches/upstream_init-application-notifier.diff
deleted file mode 100644
index 34d8bca..0000000
--- a/debian/patches/upstream_init-application-notifier.diff
+++ /dev/null
@@ -1,12 +0,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