Bug#775586: unblock: kdepim-runtime/4:4.14.2-3
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
Please unblock package kdepim-runtime
With the current version in jessie, the migration from kmail1 to kmail2
process blocks forever till the user stops it and manually restarts akonadi,
(as reported in https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=727800#124)
The uploaded version adds a patch that restart the akonadi process instead, so
the migration behaves as expected.
unblock kdepim-runtime/4:4.14.2-3
- -- System Information:
Debian Release: 8.0
APT prefers unstable
APT policy: (500, 'unstable'), (500, 'testing'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 3.16.0-4-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash
Init: systemd (via /run/systemd/system)
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQIcBAEBCAAGBQJUuqkbAAoJEMcZdpmymyMqNXkP/1DzmFPpFP0yvk8PghNcdF+m
ue8b7wjto051upzfVdlogpakhkK6reyQnaBy1jesoImzQ5SVhOfL7d6d1R5Y8Eev
cLBPlaqueKZDcLUglxr3yVMirE+LmMMgviPN6HsjgwdD0RJ5C+rWoCg6lO1QH043
i/kkgFPtJXY1sqqOu3bNnoPnLTq4TvqLSZLGBVxQtlNVWaVJ0OIjmgXh+SQlQjlc
LQ9O2CmA8ObZzELWlHOU4MUWqphYHHxxVL7Blis7RTzosky2rp2vxum8r7zdcyHL
zrK7LaVku7ksvl/+qHY2vGG8qa0HQw2Ilo7aldl6WHGkVuBwUY+L5O8ssVzABJw1
+vwtnpDJxu26l86G+i8b3Y4Y/AXJrMHl+DQih96UaJCr4oQIU5nE+LJ++dcE1FRw
RMd637fxemkA0Ix7k/v6KXXUfwjqSfB9q8LFJJVC2v0iyOY3kEGKAsCtWYyz4lxS
TwuW58W+xf5pY4jHY4kT5P1W65a5U/8bt2A2GCgSbNKppKrIumAA9+H4VChqBwYi
bfjKEdtK5PoXkBBww7xNVPywLZlEze+xUSQhVBNai871xMcQn2HaHjOb13Dqfb5H
nmQMp8NWZ372BSwf5DaXKLh5zF7OTkEBzM6LJjXiftwohPmJNvKU+TTax70EVLRW
1e0Glq40PLMNP1hAb5lh
=fYpn
-----END PGP SIGNATURE-----
diff -Nru kdepim-runtime-4.14.2/debian/changelog kdepim-runtime-4.14.2/debian/changelog
--- kdepim-runtime-4.14.2/debian/changelog 2014-11-17 04:44:21.000000000 +0100
+++ kdepim-runtime-4.14.2/debian/changelog 2015-01-17 11:41:00.000000000 +0100
@@ -1,3 +1,10 @@
+kdepim-runtime (4:4.14.2-3) unstable; urgency=medium
+
+ * New patch: restart_akonadi.patch, restarts akonadi to complete kmail
+ migration. (Closes: #727800) Thanks to Diane Trout
+
+ -- Maximiliano Curia <maxy@debian.org> Sat, 17 Jan 2015 11:41:00 +0100
+
kdepim-runtime (4:4.14.2-2) unstable; urgency=medium
* Team upload.
diff -Nru kdepim-runtime-4.14.2/debian/patches/restart_akonadi.patch kdepim-runtime-4.14.2/debian/patches/restart_akonadi.patch
--- kdepim-runtime-4.14.2/debian/patches/restart_akonadi.patch 1970-01-01 01:00:00.000000000 +0100
+++ kdepim-runtime-4.14.2/debian/patches/restart_akonadi.patch 2015-01-17 11:41:00.000000000 +0100
@@ -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 -Nru kdepim-runtime-4.14.2/debian/patches/series kdepim-runtime-4.14.2/debian/patches/series
--- kdepim-runtime-4.14.2/debian/patches/series 2014-11-17 04:22:40.000000000 +0100
+++ kdepim-runtime-4.14.2/debian/patches/series 2015-01-17 11:41:00.000000000 +0100
@@ -1,3 +1,4 @@
hide_akonaditray.diff
kolabproxy_unittest
tlscancelled.patch
+restart_akonadi.patch
Reply to: