[SCM] KDE PIM Runtime module packaging branch, master, updated. debian/4.14.2-1-4-gd52264e

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kdepim-runtime.git;a=commitdiff;h=0984f86

The following commit has been merged in the master branch:
commit 0984f86c3a65f18aaf3c924b3fad7bac3fa0912e
Author: Maximiliano Curia <maxy at debian.org>
Date:   Sat Jan 17 09:57:24 2015 +0100

    New patch: restart_akonadi.patch, restarts akonadi to complete kmail migration. (Closes: #727800) Thanks to Diane Trout
---
 debian/changelog                     |  3 ++-
 debian/patches/restart_akonadi.patch | 21 +++++++++++++++++++++
 debian/patches/series                |  1 +
 3 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index c463b3f..a1ef7d0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 kdepim-runtime (4:4.14.2-3~) UNRELEASED; urgency=medium
 
-  * 
+  * New patch: restart_akonadi.patch, restarts akonadi to complete kmail
+    migration. (Closes: #727800) Thanks to Diane Trout
 
  -- Maximiliano Curia <maxy at debian.org>  Sat, 17 Jan 2015 09:51:43 +0100
 
diff --git a/debian/patches/restart_akonadi.patch b/debian/patches/restart_akonadi.patch
new file mode 100644
index 0000000..bcba636
--- /dev/null
+++ b/debian/patches/restart_akonadi.patch
@@ -0,0 +1,21 @@
+--- a/migration/kmail/kmailmigrator.cpp
++++ b/migration/kmail/kmailmigrator.cpp
+@@ -46,6 +46,7 @@
+ #include <akonadi/agentinstance.h>
+ #include <akonadi/agentinstancecreatejob.h>
+ #include <akonadi/attributefactory.h>
++#include <akonadi/control.h>
+ #include <akonadi/tag.h>
+ #include <akonadi/tagcreatejob.h>
+ #include <akonadi/tagattribute.h>
+@@ -390,6 +391,10 @@
+   cleanupConfigFile();
+   migrateConfigurationDialogRestriction();
+   deleteLater();
++  emit message( Info, i18nc("@info: progress report",
++                            "Restarting akonadi"));
++
++  Akonadi::Control::restart();
+ }
+ 
+ OrgKdeAkonadiImapSettingsInterface* KMailMigrator::createImapSettingsInterface( const Akonadi::AgentInstance& instance )
diff --git a/debian/patches/series b/debian/patches/series
index 78ff968..a509ac9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 hide_akonaditray.diff
 kolabproxy_unittest
 tlscancelled.patch
+restart_akonadi.patch

-- 
KDE PIM Runtime module packaging