diff -Nru akonadi-1.13.0/debian/akonadi-backend-mysql.install akonadi1-1.13.0/debian/akonadi-backend-mysql.install
--- akonadi-1.13.0/debian/akonadi-backend-mysql.install	2014-11-03 15:02:28.000000000 +0100
+++ akonadi1-1.13.0/debian/akonadi-backend-mysql.install	1970-01-01 01:00:00.000000000 +0100
@@ -1,5 +0,0 @@
-
-debian/mysqld-akonadi /usr/sbin
-debian/usr.sbin.mysqld-akonadi /etc/apparmor.d
-etc/akonadi/mysql-global-mobile.conf
-etc/akonadi/mysql-global.conf
diff -Nru akonadi-1.13.0/debian/akonadi-backend-sqlite.docs akonadi1-1.13.0/debian/akonadi-backend-sqlite.docs
--- akonadi-1.13.0/debian/akonadi-backend-sqlite.docs	2014-11-03 15:02:28.000000000 +0100
+++ akonadi1-1.13.0/debian/akonadi-backend-sqlite.docs	1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-README.sqlite
diff -Nru akonadi-1.13.0/debian/akonadi-backend-sqlite.install akonadi1-1.13.0/debian/akonadi-backend-sqlite.install
--- akonadi-1.13.0/debian/akonadi-backend-sqlite.install	2014-11-03 15:02:28.000000000 +0100
+++ akonadi1-1.13.0/debian/akonadi-backend-sqlite.install	1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-usr/lib/*/qt4/plugins/sqldrivers/libqsqlite3.so
diff -Nru akonadi-1.13.0/debian/akonadi-server.install akonadi1-1.13.0/debian/akonadi-server.install
--- akonadi-1.13.0/debian/akonadi-server.install	2014-11-03 15:02:28.000000000 +0100
+++ akonadi1-1.13.0/debian/akonadi-server.install	1970-01-01 01:00:00.000000000 +0100
@@ -1,9 +0,0 @@
-usr/bin/akonadi_agent_launcher
-usr/bin/akonadi_agent_server
-usr/bin/akonadi_control
-usr/bin/akonadi_rds
-usr/bin/akonadictl
-usr/bin/akonadiserver
-usr/bin/asapcat
-usr/share/dbus-1/services/org.freedesktop.Akonadi.Control.service
-usr/share/mime/packages/akonadi-mime.xml
diff -Nru akonadi-1.13.0/debian/changelog akonadi1-1.13.0/debian/changelog
--- akonadi-1.13.0/debian/changelog	2015-08-02 12:57:02.000000000 +0200
+++ akonadi1-1.13.0/debian/changelog	2015-09-02 10:07:54.000000000 +0200
@@ -1,3 +1,74 @@
+akonadi1 (1.13.0-8ubuntu1) UNRELEASED; urgency=medium
+
+  * Rename source to akonadi1 from akonadi
+    + This is now a transitional source to allow kde4pimlibs applications to
+      install
+    + Merge with debian unstable
+    + Rename all packages to reflect their association with akonadi1
+    + Rip out all runtime packages (-server -backend-*) as we do not support
+      actually running the akonadi1 server
+
+ -- Harald Sitter <sitter@kde.org>  Wed, 02 Sep 2015 09:57:37 +0200
+
+akonadi (1.13.0-8) unstable; urgency=medium
+
+  * Team upload.
+  * Update symbols files.
+
+ -- Maximiliano Curia <maxy@debian.org>  Sat, 29 Aug 2015 00:41:28 +0200
+
+akonadi (1.13.0-7) unstable; urgency=medium
+
+  * Team upload.
+  * Removed some patches introduced in previous upload due to regressions
+    causing invalid SQL commands.
+
+ -- Dmitry Smirnov <onlyjob@debian.org>  Mon, 20 Jul 2015 12:30:32 +1000
+
+akonadi (1.13.0-6) unstable; urgency=medium
+
+  * Team upload.
+  * New "upstream-MOVEcomplete.patch" (fixes deadlock).
+  * Bunch of optimisation patches from upstream 1.13 branch.
+  * Install "akonadictl.1" man page.
+  * copyright: reviewed, converted to copyright-format-1.0 and updated.
+
+ -- Dmitry Smirnov <onlyjob@debian.org>  Mon, 20 Jul 2015 03:26:42 +1000
+
+akonadi (1.13.0-5) unstable; urgency=medium
+
+  * Team upload.
+  * New upstream patches:
+    + upstream-use-QAtomicInt.patch
+    + upstream-prevent-QTimer-negative-interval.patch
+  * Initialise PSQL database with "--data-checksums" (Closes: #791807).
+  * Build-Depends: removed "mysql-server-core" (not needed on build time).
+
+ -- Dmitry Smirnov <onlyjob@debian.org>  Sun, 19 Jul 2015 20:31:33 +1000
+
+akonadi (1.13.0-4) unstable; urgency=medium
+
+  * Team upload.
+  * backend-mysql: depend on MySQL-5.6 or any MySQL flavour (Closes: #746651)
+    Depends:
+    - mysql-server-core-5.5 | mysql-server-core
+    + mysql-server-core-5.6 | virtual-mysql-server-core
+  * Standards-Version: 3.9.6.
+  * xs-testsuite-header-in-debian-control: removed "XS-Testsuite" header.
+  * Updated Vcs-Browser URL.
+  * Patches renamed to consistently end with ".patch".
+  * New patch to add PostgreSQL 9.4 search path (Closes: #791805).
+
+ -- Dmitry Smirnov <onlyjob@debian.org>  Mon, 13 Jul 2015 23:56:38 +1000
+
+akonadi (1.13.0-3) unstable; urgency=medium
+
+  * Team upload.
+  * Apply upstream_dont_leak_old_external_payload_files.patch which fixes a bug
+    that let old files be kept when they should be removed.
+
+ -- Lisandro Damián Nicanor Pérez Meyer <lisandro@debian.org>  Tue, 30 Jun 2015 12:03:32 -0300
+
 akonadi (1.13.0-2ubuntu5) wily; urgency=medium
 
   * No change rebuild for boost1.58/libstdc++6.
diff -Nru akonadi-1.13.0/debian/control akonadi1-1.13.0/debian/control
--- akonadi-1.13.0/debian/control	2015-04-15 19:16:06.000000000 +0200
+++ akonadi1-1.13.0/debian/control	2015-09-02 10:07:54.000000000 +0200
@@ -1,7 +1,7 @@
-Source: akonadi
+Source: akonadi1
 Section: libs
 Priority: optional
-Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
+Maintainer: Debian/Kubuntu Krap Maintainers <debian-qt-kde@lists.debian.org>
 Uploaders: Sune Vuorela <debian@pusling.com>,
            Modestas Vainius <modax@debian.org>,
            Fathi Boudra <fabo@debian.org>,
@@ -20,32 +20,14 @@
                pkg-kde-tools (>= 0.12),
                shared-mime-info (>= 0.20),
                xsltproc
-Standards-Version: 3.9.5
-XS-Testsuite: autopkgtest
+Standards-Version: 3.9.6
 Homepage: http://pim.kde.org/akonadi
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/kde-req/akonadi.git
-Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-req/akonadi.git
-
-Package: akonadi-server
-Section: net
-Architecture: any
-Depends: akonadi-backend-mysql (= ${source:Version}),
-         ${misc:Depends},
-         ${shlibs:Depends}
-Suggests: akonadi-backend-mysql (= ${source:Version}),
-          akonadi-backend-postgresql (= ${source:Version}),
-          akonadi-backend-sqlite (= ${binary:Version})
-Description: Akonadi PIM storage service
- Akonadi is an extensible cross-desktop Personal Information Management (PIM)
- storage service. It provides a common framework for applications to store and
- access mail, calendars, addressbooks, and other PIM data.
- .
- This package contains the Akonadi PIM storage server and associated programs.
+Vcs-Browser: http://anonscm.debian.org/cgit/pkg-kde/krap/akonadi1.git
+Vcs-Git: git://anonscm.debian.org/pkg-kde/krap/akonadi1.git
 
 Package: libakonadiprotocolinternals1
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Suggests: akonadi-server (= ${binary:Version})
 Replaces: libakonadiprivate1 (<< 1.4.90)
 Breaks: kdepim-runtime (<< 4:4.13), libakonadiprivate1 (<< 1.4.90)
 Description: libraries for the Akonadi PIM storage service
@@ -55,7 +37,7 @@
  .
  This package contains libraries used by the Akonadi PIM storage service.
 
-Package: libakonadi-dev
+Package: libakonadi1-dev
 Section: libdevel
 Architecture: any
 Depends: libakonadiprotocolinternals1 (= ${binary:Version}),
@@ -71,68 +53,11 @@
  This package contains development files for building software that uses the
  Akonadi PIM storage service.
 
-Package: akonadi-backend-mysql
-Section: misc
-Architecture: all
-Depends: libqt4-sql-mysql,
-         mysql-client-core-5.6 | virtual-mysql-client-core,
-         mysql-server-core-5.6 | virtual-mysql-server-core,
-         ${misc:Depends}
-Recommends: akonadi-server
-Replaces: akonadi-server (<< 1.3.60~)
-Breaks: akonadi-server (<< 1.3.60~)
-Description: MySQL storage backend for Akonadi
- Akonadi is an extensible cross-desktop Personal Information Management (PIM)
- storage service. It provides a common framework for applications to store and
- access mail, calendars, addressbooks, and other PIM data.
- .
- This package installs everything what's needed for Akonadi to work with MySQL
- as underlying data storage engine. By default, a local MySQL server instance
- will be started for each user. Alternatively, connection to an external MySQL
- database is supported as well.
-
-Package: akonadi-backend-postgresql
-Section: misc
-Architecture: all
-Depends: libqt4-sql-psql, ${misc:Depends}
-Recommends: akonadi-server, postgresql
-Replaces: akonadi-server (<< 1.3.60~)
-Breaks: akonadi-server (<< 1.3.60~)
-Description: PostgreSQL storage backend for Akonadi
- Akonadi is an extensible cross-desktop Personal Information Management (PIM)
- storage service. It provides a common framework for applications to store and
- access mail, calendars, addressbooks, and other PIM data.
- .
- This package installs everything what's needed for Akonadi to work with
- PostgreSQL as underlying data storage engine. By default, a local PostgreSQL
- server instance will be started for each user. Alternatively, connection to an
- external PostgreSQL database is supported as well.
-
-Package: akonadi-backend-sqlite
-Section: misc
-Architecture: any
-Pre-Depends: ${misc:Pre-Depends}
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Recommends: akonadi-server
-Description: SQLite storage backend for Akonadi
- Akonadi is an extensible cross-desktop Personal Information Management (PIM)
- storage service. It provides a common framework for applications to store and
- access mail, calendars, addressbooks, and other PIM data.
- .
- This package installs everything what's needed for Akonadi to work with SQLite
- as underlying data storage engine. Since SQLite is an embedded database
- engine, a separate SQL server daemon is not necessary.
- .
- In addition, the package contains an improved QSql driver for SQLite named
- "QSQLite3". It can be used by any application that needs to access SQLite
- databases via standard Qt QSql framework.
-
-Package: akonadi-dbg
+Package: akonadi1-dbg
 Section: debug
 Priority: extra
 Architecture: any
-Depends: ${misc:Depends}
-Suggests: akonadi-server (= ${binary:Version})
+Depends: libakonadiprotocolinternals1 (= ${binary:Depends}), ${misc:Depends}
 Description: debugging symbols for the Akonadi PIM storage service
  Akonadi is an extensible cross-desktop Personal Information Management (PIM)
  storage service. It provides a common framework for applications to store and
diff -Nru akonadi-1.13.0/debian/copyright akonadi1-1.13.0/debian/copyright
--- akonadi-1.13.0/debian/copyright	2014-11-03 15:02:28.000000000 +0100
+++ akonadi1-1.13.0/debian/copyright	2015-09-02 10:07:54.000000000 +0200
@@ -1,110 +1,111 @@
-This package was debianized by Sune Vuorela <debian@pusling.com> on
-Fri,  24 april 2008 09:49:34 +0200.
-
-It was downloaded from http://download.akonadi-project.org/
-
-Copyright: © 2006-2010 Volker Krause <vkrause@kde.org>
-Copyright: © 2006-2010 Tobias Koenig <tokoe@kde.org>
-Copyright: © 2006 Till Adam <adam@kde.org>
-Copyright: © 2010 Bertjan Broeksema <broeksema@kde.org>
-Copyright: © 2008-2009 Sebastian Trueg <sebastian@trueg.de> <trueg@kde.org>
-Copyright: © 2009 Andras Mantia <amantia@kde.org>
-Copyright: © 2006, 2008-2009 Alexander Neundorf <neundorf@kde.org>
-Copyright: © 2007 Will Stephenson <wstephenson@kde.org>
-Copyright: © 2009 Szymon Stefanek <s.stefanek@gmail.com>
-Copyright: © 2007 Robert Zwerus <arzie@dds.nl>
-Copyright: © 2006 Andreas Gungl <a.gungl@gmx.de>
-Copyright: © 2006 Ingo Kloecker <kloecker@kde.org>
-Copyright: © 2006-2007 David Faure <faure@kde.org>
-Copyright: © 2010 Michael Jansen <kde@michael-jansen>
-Copyright: © 2007-2008 Kevin Krammer <kevin.krammer@gmx.at>
-Copyright: © 2002 Insight Consortium. All Rights Reserved.
-Copyright: © 2000 Timo Hummel <timo.hummel@sap.com>
-Copyright: © 2000 Tom Braun <braunt@fh-konstanz.de>
-Copyright: © 1997 Matthias Kalle Dalheimer <kalle@kde.org>
-Copyright: © 2010 Christophe Giboudeaux <cgiboudeaux@gmail.com>
-Copyright: © 2002 Holger Freyther <freyther@kde.org>
-Copyright: © 2010 Marc Mutz <mutz@kde.org>
-Copyright: © 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
-Copyright: © 2006 Allen Winter <winter@kde.org>
-Copyright: © 2007 Pino Toscano <toscano.pino@tiscali.it>
-Copyright: © 2010 Kitware Inc.
-Copyright: © 2008 Gilles Caulier <caulier.gilles@gmail.com>
-Copyright: © 2010 Milian Wolff <mail@milianw.de>
-Copyright: © 2010 Andreas Holzammer <andy@kdab.com>
-Copyright: © 2007 Christian Ehrlicher <ch.ehrlicher@gmx.de>
-
-Upstream authors:
-
-  Main Authors:
-  - Volker Krause <vkrause@kde.org>
-  - Till Adam <adam@kde.org>
-  - Tobias Koenig <tokoe@kde.org>
-  - Kevin Krammer <kevin.krammer@gmx.at>
-
-  Contributors:
-  - Alexander Neundorf <neundorf@kde.org>
-  - Allen Winter <winter@kde.org>
-  - Andreas Gungl <a.gungl@gmx.de>
-  - Christian Schaarschmidt <schaarsc@gmx.de>
-  - David Faure <faure@kde.org>
-  - Ingo Kloecker <kloecker@kde.org>
-  - Kitware, Inc., Insight Consortium.
-  - Laurent Montel <montel@kde.org>
-  - Matthias Kretz <kretz@kde.org>
-  - Pino Toscano <toscano.pino@tiscali.it>
-  - Robert Zwerus <arzie@dds.nl>
-  - Timo Hummel <timo.hummel@sap.com>
-  - Will Stephenson <wstephenson@kde.org>
-
-Some cmake modules references a nonexistant file. That file is in kdelibs
-source package and in cmake source package with the following content:
-
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-1. Redistributions of source code must retain the copyright
-   notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-3. The name of the author may not be used to endorse or promote products
-   derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-The rest is according to the file lgpl-license:
-
-License:
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Library General Public
-    License as published by the Free Software Foundation; either
-    version 2 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Library General Public License for more details.
-
-    You should have received a copy of the GNU Library General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA  02110-1301 USA
-
-On Debian systems, the complete text of the GNU Library General
-Public License can be found in `/usr/share/common-licenses/LGPL-2-1'.
-
-The Debian packaging is © 2008-2010, Debian Qt/KDE Maintainers and
-is licensed under the same license as the software, LGPL-2-1, see above.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: Akonadi
+Source: http://download.kde.org/stable/akonadi/src/
+Comment:
+ This package was debianized by Sune Vuorela <debian@pusling.com>
+ on Fri, 24 april 2008 09:49:34 +0200.
+
+Files: *
+Copyright:
+    2009      Andras Mantia <amantia@kde.org>
+    2006      Andreas Gungl <a.gungl@gmx.de>
+    2009-2010 Bertjan Broeksema <broeksema@kde.org>
+    2014      Christian Mollekopf <mollekopf@kolabsys.com>
+    2007      Christian Schaarschmidt <schaarsc@gmx.de>
+    2013-2014 Daniel Vrátil <dvratil@redhat.com>
+    2006-2007 David Faure <faure@kde.org>
+    2002      Holger Freyther <freyther@kde.org>
+    2006      Ingo Kloecker <kloecker@kde.org>
+    2007-2008 Kevin Krammer <kevin.krammer@gmx.at>
+    2010      Marc Mutz <mutz@kde.org>
+    1997      Matthias Kalle Dalheimer <kalle@kde.org>
+    2010      Michael Jansen <kde@michael-jansen>
+    2010      Milian Wolff <mail@milianw.de>
+    2007      Robert Zwerus <arzie@dds.nl>
+    2008-2010 Sebastian Trueg <sebastian@trueg.de> <trueg@kde.org>
+    2009      Szymon Stefanek <s.stefanek@gmail.com>
+    2006      Till Adam <adam@kde.org>
+    2000      Timo Hummel <timo.hummel@sap.com>
+    2006-2010 Tobias Koenig <tokoe@kde.org>
+    2000      Tom Braun <braunt@fh-konstanz.de>
+    2006-2013 Volker Krause <vkrause@kde.org>
+License: LGPL-2+
+Comment:
+ See full list of contributors in "AUTHORS" file.
+
+Files:
+    qsqlite/src/QtSql/private/qsqlcachedresult_p.h
+    qsqlite/src/qsql_sqlite.cpp
+    qsqlite/src/qsql_sqlite.h
+    qsqlite/src/smain.cpp
+Copyright: 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
+License: LGPL-2.1+
+
+Files: cmake/modules/*
+Copyright:
+    2007      Christian Ehrlicher <ch.ehrlicher@gmx.de>
+    2010      Christophe Giboudeaux <cgiboudeaux@gmail.com>
+    2006      David Faure, <faure@kde.org>
+    2008      Gilles Caulier <caulier.gilles@gmail.com>
+    2000-2011 Kitware, Inc., Insight Software Consortium
+    2008      Kevin Krammer <kevin.krammer@gmx.at>
+    2007      Pino Toscano <toscano.pino@tiscali.it>
+    2007      Will Stephenson <wstephenson@kde.org>
+License: BSD-3-clause
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ .
+ 1. Redistributions of source code must retain the copyright
+    notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
+ 3. The name of the Kitware, Inc. may not be used to endorse or promote products
+    derived from this software without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+Comment:
+ Some cmake modules references a nonexistant file. That file is in kdelibs
+ source package and in cmake source package with the following content:
+
+Files: debian/*
+Copyright: 2008-2015 Debian Qt/KDE Maintainers
+License: LGPL-2.1+
+
+License: LGPL-2+
+ This library is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Library General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or (at your
+ option) any later version.
+ .
+ This library is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
+ License for more details.
+ .
+ The complete text of the GNU Library General Public License
+ can be found in "/usr/share/common-licenses/LGPL-2".
+
+License: LGPL-2.1+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
+ .
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ Library General Public License for more details.
+ .
+ The complete text of the GNU Library General Public License
+ can be found in "/usr/share/common-licenses/LGPL-2.1".
diff -Nru akonadi-1.13.0/debian/libakonadi1-dev.dirs akonadi1-1.13.0/debian/libakonadi1-dev.dirs
--- akonadi-1.13.0/debian/libakonadi1-dev.dirs	1970-01-01 01:00:00.000000000 +0100
+++ akonadi1-1.13.0/debian/libakonadi1-dev.dirs	2015-09-02 10:07:54.000000000 +0200
@@ -0,0 +1 @@
+/usr/share/dbus-1/services
diff -Nru akonadi-1.13.0/debian/libakonadi1-dev.install akonadi1-1.13.0/debian/libakonadi1-dev.install
--- akonadi-1.13.0/debian/libakonadi1-dev.install	1970-01-01 01:00:00.000000000 +0100
+++ akonadi1-1.13.0/debian/libakonadi1-dev.install	2015-09-02 10:07:54.000000000 +0200
@@ -0,0 +1,30 @@
+usr/include/akonadi/abstractsearchplugin.h
+usr/include/akonadi/private/akonadiprotocolinternals_export.h
+usr/include/akonadi/private/capabilities_p.h
+usr/include/akonadi/private/imapparser_p.h
+usr/include/akonadi/private/imapset_p.h
+usr/include/akonadi/private/notificationmessage_p.h
+usr/include/akonadi/private/notificationmessagev2_p.h
+usr/include/akonadi/private/notificationmessagev3_p.h
+usr/include/akonadi/private/protocol_p.h
+usr/include/akonadi/private/xdgbasedirs_p.h
+usr/lib/cmake/Akonadi/AkonadiConfig.cmake
+usr/lib/cmake/Akonadi/AkonadiConfigVersion.cmake
+usr/lib/cmake/Akonadi/AkonadiTargetsWithPrefix-debian.cmake
+usr/lib/cmake/Akonadi/AkonadiTargetsWithPrefix.cmake
+usr/lib/libakonadiprotocolinternals.so
+usr/lib/pkgconfig/akonadi.pc
+usr/share/dbus-1/interfaces/org.freedesktop.Akonadi.Agent.Control.xml
+usr/share/dbus-1/interfaces/org.freedesktop.Akonadi.Agent.Search.xml
+usr/share/dbus-1/interfaces/org.freedesktop.Akonadi.Agent.Status.xml
+usr/share/dbus-1/interfaces/org.freedesktop.Akonadi.AgentManager.xml
+usr/share/dbus-1/interfaces/org.freedesktop.Akonadi.ControlManager.xml
+usr/share/dbus-1/interfaces/org.freedesktop.Akonadi.DebugInterface.xml
+usr/share/dbus-1/interfaces/org.freedesktop.Akonadi.NotificationManager.xml
+usr/share/dbus-1/interfaces/org.freedesktop.Akonadi.NotificationSource.xml
+usr/share/dbus-1/interfaces/org.freedesktop.Akonadi.Preprocessor.xml
+usr/share/dbus-1/interfaces/org.freedesktop.Akonadi.Resource.xml
+usr/share/dbus-1/interfaces/org.freedesktop.Akonadi.Server.xml
+usr/share/dbus-1/interfaces/org.freedesktop.Akonadi.StorageDebugger.xml
+usr/share/dbus-1/interfaces/org.freedesktop.Akonadi.Tracer.xml
+usr/share/dbus-1/interfaces/org.freedesktop.Akonadi.TracerNotification.xml
diff -Nru akonadi-1.13.0/debian/libakonadi-dev.dirs akonadi1-1.13.0/debian/libakonadi-dev.dirs
--- akonadi-1.13.0/debian/libakonadi-dev.dirs	2014-11-03 15:02:28.000000000 +0100
+++ akonadi1-1.13.0/debian/libakonadi-dev.dirs	1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-/usr/share/dbus-1/services
diff -Nru akonadi-1.13.0/debian/libakonadi-dev.install akonadi1-1.13.0/debian/libakonadi-dev.install
--- akonadi-1.13.0/debian/libakonadi-dev.install	2014-11-03 15:02:28.000000000 +0100
+++ akonadi1-1.13.0/debian/libakonadi-dev.install	1970-01-01 01:00:00.000000000 +0100
@@ -1,30 +0,0 @@
-usr/include/akonadi/abstractsearchplugin.h
-usr/include/akonadi/private/akonadiprotocolinternals_export.h
-usr/include/akonadi/private/capabilities_p.h
-usr/include/akonadi/private/imapparser_p.h
-usr/include/akonadi/private/imapset_p.h
-usr/include/akonadi/private/notificationmessage_p.h
-usr/include/akonadi/private/notificationmessagev2_p.h
-usr/include/akonadi/private/notificationmessagev3_p.h
-usr/include/akonadi/private/protocol_p.h
-usr/include/akonadi/private/xdgbasedirs_p.h
-usr/lib/cmake/Akonadi/AkonadiConfig.cmake
-usr/lib/cmake/Akonadi/AkonadiConfigVersion.cmake
-usr/lib/cmake/Akonadi/AkonadiTargetsWithPrefix-debian.cmake
-usr/lib/cmake/Akonadi/AkonadiTargetsWithPrefix.cmake
-usr/lib/libakonadiprotocolinternals.so
-usr/lib/pkgconfig/akonadi.pc
-usr/share/dbus-1/interfaces/org.freedesktop.Akonadi.Agent.Control.xml
-usr/share/dbus-1/interfaces/org.freedesktop.Akonadi.Agent.Search.xml
-usr/share/dbus-1/interfaces/org.freedesktop.Akonadi.Agent.Status.xml
-usr/share/dbus-1/interfaces/org.freedesktop.Akonadi.AgentManager.xml
-usr/share/dbus-1/interfaces/org.freedesktop.Akonadi.ControlManager.xml
-usr/share/dbus-1/interfaces/org.freedesktop.Akonadi.DebugInterface.xml
-usr/share/dbus-1/interfaces/org.freedesktop.Akonadi.NotificationManager.xml
-usr/share/dbus-1/interfaces/org.freedesktop.Akonadi.NotificationSource.xml
-usr/share/dbus-1/interfaces/org.freedesktop.Akonadi.Preprocessor.xml
-usr/share/dbus-1/interfaces/org.freedesktop.Akonadi.Resource.xml
-usr/share/dbus-1/interfaces/org.freedesktop.Akonadi.Server.xml
-usr/share/dbus-1/interfaces/org.freedesktop.Akonadi.StorageDebugger.xml
-usr/share/dbus-1/interfaces/org.freedesktop.Akonadi.Tracer.xml
-usr/share/dbus-1/interfaces/org.freedesktop.Akonadi.TracerNotification.xml
diff -Nru akonadi-1.13.0/debian/libakonadiprotocolinternals1.symbols akonadi1-1.13.0/debian/libakonadiprotocolinternals1.symbols
--- akonadi-1.13.0/debian/libakonadiprotocolinternals1.symbols	2014-11-03 15:02:28.000000000 +0100
+++ akonadi1-1.13.0/debian/libakonadiprotocolinternals1.symbols	2015-09-02 10:07:54.000000000 +0200
@@ -85,8 +85,8 @@
  _ZN7Akonadi21NotificationMessageV219setParentCollectionEx@Base 1.10.2
  _ZN7Akonadi21NotificationMessageV222setDestinationResourceERK10QByteArray@Base 1.10.2
  _ZN7Akonadi21NotificationMessageV223setParentDestCollectionEx@Base 1.10.2
- _ZN7Akonadi21NotificationMessageV26EntityD1Ev@Base 1.10.2
- _ZN7Akonadi21NotificationMessageV26EntityD2Ev@Base 1.10.2
+ (optional=gccinternal|arch=sparc)_ZN7Akonadi21NotificationMessageV26EntityD1Ev@Base 1.13.0
+ (optional=gccinternal|arch=sparc)_ZN7Akonadi21NotificationMessageV26EntityD2Ev@Base 1.13.0
  _ZN7Akonadi21NotificationMessageV27setTypeENS0_4TypeE@Base 1.10.2
  _ZN7Akonadi21NotificationMessageV29addEntityExRK7QStringS3_S3_@Base 1.10.2
  _ZN7Akonadi21NotificationMessageV2C1ERKS0_@Base 1.10.2
diff -Nru akonadi-1.13.0/debian/man/akonadictl.1 akonadi1-1.13.0/debian/man/akonadictl.1
--- akonadi-1.13.0/debian/man/akonadictl.1	1970-01-01 01:00:00.000000000 +0100
+++ akonadi1-1.13.0/debian/man/akonadictl.1	2015-09-02 10:07:54.000000000 +0200
@@ -0,0 +1,39 @@
+.TH AKONADI "1" "July 2015" "Akonadi 1.13.0" "User Commands"
+.SH NAME
+akonadictl \- Akonadi server manipulation tool
+.SH SYNOPSIS
+.B akonadictl
+[\fI\,command\/\fR]
+.SH DESCRIPTION
+.SS "Commands:"
+.TP
+start
+: Starts the Akonadi server with all its processes
+.TP
+stop
+: Stops the Akonadi server and all its processes cleanly
+.TP
+restart
+: Restart Akonadi server with all its processes
+.TP
+status
+: Shows a status overview of the Akonadi server
+.TP
+vacuum
+: Vacuum internal storage (WARNING: needs a lot of time and disk space!)
+.TP
+fsck
+: Check (and attempt to fix) consistency of the internal storage (can take some time)
+.SH OPTIONS
+.SS "General options:"
+.TP
+\fB\-h\fR [ \fB\-\-help\fR ]
+show this help message
+.TP
+\fB\-\-version\fR
+show version information
+.SS "Multi-instance options:"
+.TP
+\fB\-\-instance\fR arg
+Namespace for starting multiple Akonadi instances in
+the same user session
diff -Nru akonadi-1.13.0/debian/mysqld-akonadi akonadi1-1.13.0/debian/mysqld-akonadi
--- akonadi-1.13.0/debian/mysqld-akonadi	2014-11-03 15:02:28.000000000 +0100
+++ akonadi1-1.13.0/debian/mysqld-akonadi	1970-01-01 01:00:00.000000000 +0100
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec /usr/sbin/mysqld $@
diff -Nru akonadi-1.13.0/debian/not-installed akonadi1-1.13.0/debian/not-installed
--- akonadi-1.13.0/debian/not-installed	1970-01-01 01:00:00.000000000 +0100
+++ akonadi1-1.13.0/debian/not-installed	2015-09-02 10:07:54.000000000 +0200
@@ -0,0 +1 @@
+usr/bin/asapcat
diff -Nru akonadi-1.13.0/debian/patches/postgresql9.4.patch akonadi1-1.13.0/debian/patches/postgresql9.4.patch
--- akonadi-1.13.0/debian/patches/postgresql9.4.patch	1970-01-01 01:00:00.000000000 +0100
+++ akonadi1-1.13.0/debian/patches/postgresql9.4.patch	2015-09-02 10:07:54.000000000 +0200
@@ -0,0 +1,22 @@
+Last-Update: 2015-07-14
+Forwarded: no
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=791805
+Author: Dmitry Smirnov <onlyjob@member.fsf.org>
+Description: add PostgreSQL 9.4 path
+ Perhaps there shall be a better way to find PostgreSQL executable than
+ to search through the list of hard-coded paths...
+
+--- a/server/src/storage/dbconfigpostgresql.cpp
++++ b/server/src/storage/dbconfigpostgresql.cpp
+@@ -78,9 +78,10 @@
+                        << QLatin1String( "/usr/lib/postgresql/8.4/bin" )
+                        << QLatin1String( "/usr/lib/postgresql/9.0/bin" )
+                        << QLatin1String( "/usr/lib/postgresql/9.1/bin" )
+                        << QLatin1String( "/usr/lib/postgresql/9.2/bin" )
+-                       << QLatin1String( "/usr/lib/postgresql/9.3/bin" );
++                       << QLatin1String( "/usr/lib/postgresql/9.3/bin" )
++                       << QLatin1String( "/usr/lib/postgresql/9.4/bin" );
+ 
+     defaultServerPath = XdgBaseDirs::findExecutableFile( QLatin1String( "pg_ctl" ), postgresSearchPath );
+     defaultInitDbPath = XdgBaseDirs::findExecutableFile( QLatin1String( "initdb" ), postgresSearchPath );
+     defaultHostName = Utils::preferredSocketDirectory( AkStandardDirs::saveDir( "data", QLatin1String( "db_misc" ) ) );
diff -Nru akonadi-1.13.0/debian/patches/postgresql-data-checksums.patch akonadi1-1.13.0/debian/patches/postgresql-data-checksums.patch
--- akonadi-1.13.0/debian/patches/postgresql-data-checksums.patch	1970-01-01 01:00:00.000000000 +0100
+++ akonadi1-1.13.0/debian/patches/postgresql-data-checksums.patch	2015-09-02 10:07:54.000000000 +0200
@@ -0,0 +1,18 @@
+Last-Update: 2015-07-14
+Forwarded: no
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=791807
+Author: Dmitry Smirnov <onlyjob@member.fsf.org>
+Description: initialise PSQL database with "--data-checksums".
+
+--- a/server/src/storage/dbconfigpostgresql.cpp
++++ b/server/src/storage/dbconfigpostgresql.cpp
+@@ -219,8 +219,9 @@
+     const QString command = QString::fromLatin1( "%1" ).arg( mInitDbPath );
+     QStringList arguments;
+     arguments << QString::fromLatin1( "--pgdata=%2" ).arg( mPgData )
+               // TODO check locale
++              << QString::fromLatin1( "--data-checksums" )
+               << QString::fromLatin1( "--locale=en_US.UTF-8" );
+     QProcess::execute( command, arguments );
+   }
+ 
diff -Nru akonadi-1.13.0/debian/patches/series akonadi1-1.13.0/debian/patches/series
--- akonadi-1.13.0/debian/patches/series	2014-11-03 15:02:28.000000000 +0100
+++ akonadi1-1.13.0/debian/patches/series	2015-09-02 10:07:54.000000000 +0200
@@ -1,4 +1,14 @@
-upstream-fix_typo_in_if_condition
-upstream-fix_buffer_overflow_in_AKTEST_FAKESERVER_MAIN
-upstream-do_not_crash_when_setmntent_returns_NULL
-upstream_dont_call_insert_from_Q_ASSERT
+postgresql-data-checksums.patch
+postgresql9.4.patch
+upstream-MOVEcomplete.patch
+upstream-fix_typo_in_if_condition.patch
+upstream-fix_buffer_overflow_in_AKTEST_FAKESERVER_MAIN.patch
+upstream-do_not_crash_when_setmntent_returns_NULL.patch
+upstream-prevent-QTimer-negative-interval.patch
+upstream-use-QAtomicInt.patch
+upstream_dont_call_insert_from_Q_ASSERT.patch
+upstream_dont_leak_old_external_payload_files.patch
+upstream_opt-0002-intern-entity-strings.patch
+upstream_opt-0003-QMutexLocker.patch
+upstream_opt-0004-one-hash-lookup.patch
+upstream_opt-0005-optimize-queries.patch
diff -Nru akonadi-1.13.0/debian/patches/upstream-do_not_crash_when_setmntent_returns_NULL akonadi1-1.13.0/debian/patches/upstream-do_not_crash_when_setmntent_returns_NULL
--- akonadi-1.13.0/debian/patches/upstream-do_not_crash_when_setmntent_returns_NULL	2014-11-03 15:02:28.000000000 +0100
+++ akonadi1-1.13.0/debian/patches/upstream-do_not_crash_when_setmntent_returns_NULL	1970-01-01 01:00:00.000000000 +0100
@@ -1,24 +0,0 @@
-commit ca59eb345cfef368242929ea33beca4bff837e9d
-Author: Dan Vrátil <dvratil@redhat.com>
-Date:   Thu Sep 18 16:54:26 2014 +0200
-
-    Don't crash when setmntent returns NULL
-    
-    setmntent can fail when there's no /etc/mtab file for instance and
-    passing NULL pointer to getmntent crashes, so we need to return when
-    this happens.
-
-diff --git a/server/src/utils.cpp b/server/src/utils.cpp
-index b04a812..b51c330 100644
---- a/server/src/utils.cpp
-+++ b/server/src/utils.cpp
-@@ -179,6 +179,9 @@ QString Utils::getDirectoryFileSystem(const QString &directory)
-     QString bestMatchFS;
- 
-     FILE *mtab = setmntent("/etc/mtab", "r");
-+    if (!mtab) {
-+        return QString();
-+    }
-     while (mntent *mnt = getmntent(mtab)) {
-         if (qstrcmp(mnt->mnt_type, MNTTYPE_IGNORE) == 0) {
-             continue;
diff -Nru akonadi-1.13.0/debian/patches/upstream-do_not_crash_when_setmntent_returns_NULL.patch akonadi1-1.13.0/debian/patches/upstream-do_not_crash_when_setmntent_returns_NULL.patch
--- akonadi-1.13.0/debian/patches/upstream-do_not_crash_when_setmntent_returns_NULL.patch	1970-01-01 01:00:00.000000000 +0100
+++ akonadi1-1.13.0/debian/patches/upstream-do_not_crash_when_setmntent_returns_NULL.patch	2015-09-02 10:07:54.000000000 +0200
@@ -0,0 +1,24 @@
+commit ca59eb345cfef368242929ea33beca4bff837e9d
+Author: Dan Vrátil <dvratil@redhat.com>
+Date:   Thu Sep 18 16:54:26 2014 +0200
+
+    Don't crash when setmntent returns NULL
+    
+    setmntent can fail when there's no /etc/mtab file for instance and
+    passing NULL pointer to getmntent crashes, so we need to return when
+    this happens.
+
+diff --git a/server/src/utils.cpp b/server/src/utils.cpp
+index b04a812..b51c330 100644
+--- a/server/src/utils.cpp
++++ b/server/src/utils.cpp
+@@ -179,6 +179,9 @@ QString Utils::getDirectoryFileSystem(const QString &directory)
+     QString bestMatchFS;
+ 
+     FILE *mtab = setmntent("/etc/mtab", "r");
++    if (!mtab) {
++        return QString();
++    }
+     while (mntent *mnt = getmntent(mtab)) {
+         if (qstrcmp(mnt->mnt_type, MNTTYPE_IGNORE) == 0) {
+             continue;
diff -Nru akonadi-1.13.0/debian/patches/upstream_dont_call_insert_from_Q_ASSERT akonadi1-1.13.0/debian/patches/upstream_dont_call_insert_from_Q_ASSERT
--- akonadi-1.13.0/debian/patches/upstream_dont_call_insert_from_Q_ASSERT	2014-11-03 15:02:28.000000000 +0100
+++ akonadi1-1.13.0/debian/patches/upstream_dont_call_insert_from_Q_ASSERT	1970-01-01 01:00:00.000000000 +0100
@@ -1,30 +0,0 @@
-commit c516ec5c28d603aea0df6165f66a3a5d0a0191c4
-Author: Dan Vrátil <dvratil@redhat.com>
-Date:   Fri Sep 19 10:50:23 2014 +0200
-
-    Don't call insert() from Q_ASSERT - breaks unit-tests in Release mode
-
-diff --git a/server/tests/unittest/collectionreferencetest.cpp b/server/tests/unittest/collectionreferencetest.cpp
-index 1700c75..1b10c55 100644
---- a/server/tests/unittest/collectionreferencetest.cpp
-+++ b/server/tests/unittest/collectionreferencetest.cpp
-@@ -45,7 +45,8 @@ public:
-         Resource res;
-         res.setId(1);
-         res.setName(QLatin1String(name));
--        Q_ASSERT(res.insert());
-+        const bool success = res.insert();
-+        Q_ASSERT(success);
-         mResource = res;
-         return res;
-     }
-@@ -57,7 +58,8 @@ public:
-         col.setName(QLatin1String(name));
-         col.setRemoteId(QLatin1String(name));
-         col.setResource(mResource);
--        Q_ASSERT(col.insert());
-+        const bool success = col.insert();
-+        Q_ASSERT(success);
-         return col;
-     }
- 
diff -Nru akonadi-1.13.0/debian/patches/upstream_dont_call_insert_from_Q_ASSERT.patch akonadi1-1.13.0/debian/patches/upstream_dont_call_insert_from_Q_ASSERT.patch
--- akonadi-1.13.0/debian/patches/upstream_dont_call_insert_from_Q_ASSERT.patch	1970-01-01 01:00:00.000000000 +0100
+++ akonadi1-1.13.0/debian/patches/upstream_dont_call_insert_from_Q_ASSERT.patch	2015-09-02 10:07:54.000000000 +0200
@@ -0,0 +1,30 @@
+commit c516ec5c28d603aea0df6165f66a3a5d0a0191c4
+Author: Dan Vrátil <dvratil@redhat.com>
+Date:   Fri Sep 19 10:50:23 2014 +0200
+
+    Don't call insert() from Q_ASSERT - breaks unit-tests in Release mode
+
+diff --git a/server/tests/unittest/collectionreferencetest.cpp b/server/tests/unittest/collectionreferencetest.cpp
+index 1700c75..1b10c55 100644
+--- a/server/tests/unittest/collectionreferencetest.cpp
++++ b/server/tests/unittest/collectionreferencetest.cpp
+@@ -45,7 +45,8 @@ public:
+         Resource res;
+         res.setId(1);
+         res.setName(QLatin1String(name));
+-        Q_ASSERT(res.insert());
++        const bool success = res.insert();
++        Q_ASSERT(success);
+         mResource = res;
+         return res;
+     }
+@@ -57,7 +58,8 @@ public:
+         col.setName(QLatin1String(name));
+         col.setRemoteId(QLatin1String(name));
+         col.setResource(mResource);
+-        Q_ASSERT(col.insert());
++        const bool success = col.insert();
++        Q_ASSERT(success);
+         return col;
+     }
+ 
diff -Nru akonadi-1.13.0/debian/patches/upstream_dont_leak_old_external_payload_files.patch akonadi1-1.13.0/debian/patches/upstream_dont_leak_old_external_payload_files.patch
--- akonadi-1.13.0/debian/patches/upstream_dont_leak_old_external_payload_files.patch	1970-01-01 01:00:00.000000000 +0100
+++ akonadi1-1.13.0/debian/patches/upstream_dont_leak_old_external_payload_files.patch	2015-09-02 10:07:54.000000000 +0200
@@ -0,0 +1,135 @@
+From: Dan Vrátil <dvratil@redhat.com>
+Date: Mon, 29 Jun 2015 20:45:11 +0000
+Subject: Don't leak old external payload files
+X-Git-Url: http://quickgit.kde.org/?p=akonadi.git&a=commitdiff&h=9c0dc6b3f0826d32eac310b2e7ecd858ca3df681
+---
+Don't leak old external payload files
+
+Actually delete old payload files after we increase the payload revision or
+switch from external to internal payload. This caused ~/.local/share/akonadi/file_db_data
+to grow insanely for all users, leaving them with many duplicated files (just with
+different revisions).
+
+It is recommended that users run akonadictl fsck to clean up the leaked payload
+files.
+
+Note that there won't be any more releases of Akonadi 1.13 (and this has been
+fixed in master already), so I strongly recommend distributions to pick this
+patch into their packaging.
+
+BUG: 341884
+CCBUG: 338402
+---
+
+
+--- a/server/src/storage/partstreamer.cpp
++++ b/server/src/storage/partstreamer.cpp
+@@ -290,6 +290,12 @@
+         mDataChanged = true;
+     }
+ 
++    // If the part is external, remember it's current file name
++    QString originalFile;
++    if (part.isValid() && part.external()) {
++        originalFile = PartHelper::resolveAbsolutePath(part.data());
++    }
++
+     part.setPartType(partType);
+     part.setVersion(partVersion);
+     part.setPimItemId(mItem.id());
+@@ -306,6 +312,14 @@
+         *changed = mDataChanged;
+     }
+ 
++    if (!originalFile.isEmpty()) {
++        // If the part was external but is not anymore, or if it's still external
++        // but the filename has changed (revision update), remove the original file
++        if (!part.external() || (part.external() && originalFile != PartHelper::resolveAbsolutePath(part.data()))) {
++            PartHelper::removeFile(originalFile);
++        }
++    }
++
+     return ok;
+ }
+ 
+
+--- a/server/tests/unittest/partstreamertest.cpp
++++ b/server/tests/unittest/partstreamertest.cpp
+@@ -91,6 +91,7 @@
+         QTest::addColumn<qint64>("expectedPartSize");
+         QTest::addColumn<bool>("expectedChanged");
+         QTest::addColumn<bool>("isExternal");
++        QTest::addColumn<int>("version");
+         QTest::addColumn<PimItem>("pimItem");
+ 
+         PimItem item;
+@@ -101,22 +102,22 @@
+         QVERIFY(item.insert());
+ 
+         // Order of these tests matters!
+-        QTest::newRow("item 1, internal") << QByteArray("PLD:DATA") << QByteArray("123") << 3ll << true << false << item;
+-        QTest::newRow("item 1, change to external") << QByteArray("PLD:DATA") << QByteArray("123456789") << 9ll << true << true << item;
+-        QTest::newRow("item 1, update external") << QByteArray("PLD:DATA") << QByteArray("987654321") << 9ll << true << true << item;
+-        QTest::newRow("item 1, external, no change") << QByteArray("PLD:DATA") << QByteArray("987654321") << 9ll << false << true << item;
+-        QTest::newRow("item 1, change to internal") << QByteArray("PLD:DATA") << QByteArray("1234") << 4ll << true << false << item;
+-        QTest::newRow("item 1, internal, no change") << QByteArray("PLD:DATA") << QByteArray("1234") << 4ll << false << false << item;
++        QTest::newRow("item 1, internal") << QByteArray("PLD:DATA") << QByteArray("123") << 3ll << true << false << -1 << item;
++        QTest::newRow("item 1, change to external") << QByteArray("PLD:DATA") << QByteArray("123456789") << 9ll << true << true << 0 << item;
++        QTest::newRow("item 1, update external") << QByteArray("PLD:DATA") << QByteArray("987654321") << 9ll << true << true << 1 << item;
++        QTest::newRow("item 1, external, no change") << QByteArray("PLD:DATA") << QByteArray("987654321") << 9ll << false << true << 2 << item;
++        QTest::newRow("item 1, change to internal") << QByteArray("PLD:DATA") << QByteArray("1234") << 4ll << true << false << 2 << item;
++        QTest::newRow("item 1, internal, no change") << QByteArray("PLD:DATA") << QByteArray("1234") << 4ll << false << false << 2 << item;
+     }
+ 
+     void testStreamer()
+     {
+-        return;
+         QFETCH(QByteArray, expectedPartName);
+         QFETCH(QByteArray, expectedData);
+         QFETCH(qint64, expectedPartSize);
+         QFETCH(bool, expectedChanged);
+         QFETCH(bool, isExternal);
++        QFETCH(int, version);
+         QFETCH(PimItem, pimItem);
+ 
+         FakeConnection connection;
+@@ -160,17 +161,18 @@
+ 
+         PimItem item = PimItem::retrieveById(pimItem.id());
+         const QVector<Part> parts = item.parts();
+-        QVERIFY(parts.count() == 1);
++        QCOMPARE(parts.count(), 1);
+         const Part part = parts[0];
+         QCOMPARE(part.datasize(), expectedPartSize);
+         QCOMPARE(part.external(), isExternal);
++        qDebug() << part.version() << part.data();
+         const QByteArray data = part.data();
+         if (isExternal) {
+             QVERIFY(streamerSpy.count() == 1);
+             QVERIFY(streamerSpy.first().count() == 1);
+             const Response response = streamerSpy.first().first().value<Akonadi::Server::Response>();
+             const QByteArray str = response.asString();
+-            const QByteArray expectedResponse = "+ STREAM [FILE " + QByteArray::number(part.id()) + "_r" + QByteArray::number(part.version()) + "]";
++            const QByteArray expectedResponse = "+ STREAM [FILE " + QByteArray::number(part.id()) + "_r" + QByteArray::number(version) + "]";
+             QCOMPARE(QString::fromUtf8(str), QString::fromUtf8(expectedResponse));
+ 
+             QFile file(PartHelper::resolveAbsolutePath(data));
+@@ -182,7 +184,7 @@
+             QCOMPARE(fileData, expectedData);
+ 
+             // Make sure no previous versions are left behind in file_db_data
+-            for (int i = 0; i < part.version(); ++i) {
++            for (int i = 0; i < version; ++i) {
+                 const QByteArray fileName = QByteArray::number(part.id()) + "_r" + QByteArray::number(part.version());
+                 const QString filePath = PartHelper::resolveAbsolutePath(fileName);
+                 QVERIFY(!QFile::exists(filePath));
+@@ -194,7 +196,7 @@
+             QCOMPARE(data, expectedData);
+ 
+             // Make sure nothing is left behind in file_db_data
+-            for (int i = 0; i <= part.version(); ++i) {
++            for (int i = 0; i <= version; ++i) {
+                 const QByteArray fileName = QByteArray::number(part.id()) + "_r" + QByteArray::number(part.version());
+                 const QString filePath = PartHelper::resolveAbsolutePath(fileName);
+                 QVERIFY(!QFile::exists(filePath));
+
diff -Nru akonadi-1.13.0/debian/patches/upstream-fix_buffer_overflow_in_AKTEST_FAKESERVER_MAIN akonadi1-1.13.0/debian/patches/upstream-fix_buffer_overflow_in_AKTEST_FAKESERVER_MAIN
--- akonadi-1.13.0/debian/patches/upstream-fix_buffer_overflow_in_AKTEST_FAKESERVER_MAIN	2014-11-03 15:02:28.000000000 +0100
+++ akonadi1-1.13.0/debian/patches/upstream-fix_buffer_overflow_in_AKTEST_FAKESERVER_MAIN	1970-01-01 01:00:00.000000000 +0100
@@ -1,19 +0,0 @@
-commit 01c86229f9e26d9e036f6f2ab405659ed836b5c0
-Author: Dan Vrátil <dvratil@redhat.com>
-Date:   Mon Sep 8 15:36:18 2014 +0200
-
-    Fix buffer overflow in AKTEST_FAKESERVER_MAIN()
-
-diff --git a/shared/aktest.h b/shared/aktest.h
-index b1b9caa..3026304 100644
---- a/shared/aktest.h
-+++ b/shared/aktest.h
-@@ -57,7 +57,7 @@ int main(int argc, char **argv) \
-       } \
-   } \
-   TestObject tc; \
--  char **fakeArgv = (char **) malloc(options.count()); \
-+  char **fakeArgv = (char **) malloc(options.count() * sizeof(char**)); \
-   for (int i = 0; i < options.count(); ++i) { \
-       fakeArgv[i] = options[i]; \
-   } \
diff -Nru akonadi-1.13.0/debian/patches/upstream-fix_buffer_overflow_in_AKTEST_FAKESERVER_MAIN.patch akonadi1-1.13.0/debian/patches/upstream-fix_buffer_overflow_in_AKTEST_FAKESERVER_MAIN.patch
--- akonadi-1.13.0/debian/patches/upstream-fix_buffer_overflow_in_AKTEST_FAKESERVER_MAIN.patch	1970-01-01 01:00:00.000000000 +0100
+++ akonadi1-1.13.0/debian/patches/upstream-fix_buffer_overflow_in_AKTEST_FAKESERVER_MAIN.patch	2015-09-02 10:07:54.000000000 +0200
@@ -0,0 +1,19 @@
+commit 01c86229f9e26d9e036f6f2ab405659ed836b5c0
+Author: Dan Vrátil <dvratil@redhat.com>
+Date:   Mon Sep 8 15:36:18 2014 +0200
+
+    Fix buffer overflow in AKTEST_FAKESERVER_MAIN()
+
+diff --git a/shared/aktest.h b/shared/aktest.h
+index b1b9caa..3026304 100644
+--- a/shared/aktest.h
++++ b/shared/aktest.h
+@@ -57,7 +57,7 @@ int main(int argc, char **argv) \
+       } \
+   } \
+   TestObject tc; \
+-  char **fakeArgv = (char **) malloc(options.count()); \
++  char **fakeArgv = (char **) malloc(options.count() * sizeof(char**)); \
+   for (int i = 0; i < options.count(); ++i) { \
+       fakeArgv[i] = options[i]; \
+   } \
diff -Nru akonadi-1.13.0/debian/patches/upstream-fix_typo_in_if_condition akonadi1-1.13.0/debian/patches/upstream-fix_typo_in_if_condition
--- akonadi-1.13.0/debian/patches/upstream-fix_typo_in_if_condition	2014-11-03 15:02:28.000000000 +0100
+++ akonadi1-1.13.0/debian/patches/upstream-fix_typo_in_if_condition	1970-01-01 01:00:00.000000000 +0100
@@ -1,22 +0,0 @@
-commit e52f9be20e566e507e77421f1243f51aa2fe8e55
-Author: Dan Vrátil <dvratil@redhat.com>
-Date:   Mon Aug 25 14:35:14 2014 +0200
-
-    Fix typo in if condition
-    
-    BUG: 338483
-    FIXED-IN: 1.13.1
-
-diff --git a/server/src/handler/akappend.cpp b/server/src/handler/akappend.cpp
-index 43f03ba..ad3682f 100644
---- a/server/src/handler/akappend.cpp
-+++ b/server/src/handler/akappend.cpp
-@@ -380,7 +380,7 @@ bool AkAppend::parseStream()
-   if ( itemFlags.incremental ) {
-     throw HandlerException( "Incremental flags changes are not allowed in AK-APPEND" );
-   }
--  if ( itemTagsRID.incremental || itemTagsRID.incremental ) {
-+  if ( itemTagsRID.incremental || itemTagsGID.incremental ) {
-     throw HandlerException( "Incremental tags changes are not allowed in AK-APPEND" );
-   }
- 
diff -Nru akonadi-1.13.0/debian/patches/upstream-fix_typo_in_if_condition.patch akonadi1-1.13.0/debian/patches/upstream-fix_typo_in_if_condition.patch
--- akonadi-1.13.0/debian/patches/upstream-fix_typo_in_if_condition.patch	1970-01-01 01:00:00.000000000 +0100
+++ akonadi1-1.13.0/debian/patches/upstream-fix_typo_in_if_condition.patch	2015-09-02 10:07:54.000000000 +0200
@@ -0,0 +1,22 @@
+commit e52f9be20e566e507e77421f1243f51aa2fe8e55
+Author: Dan Vrátil <dvratil@redhat.com>
+Date:   Mon Aug 25 14:35:14 2014 +0200
+
+    Fix typo in if condition
+    
+    BUG: 338483
+    FIXED-IN: 1.13.1
+
+diff --git a/server/src/handler/akappend.cpp b/server/src/handler/akappend.cpp
+index 43f03ba..ad3682f 100644
+--- a/server/src/handler/akappend.cpp
++++ b/server/src/handler/akappend.cpp
+@@ -380,7 +380,7 @@ bool AkAppend::parseStream()
+   if ( itemFlags.incremental ) {
+     throw HandlerException( "Incremental flags changes are not allowed in AK-APPEND" );
+   }
+-  if ( itemTagsRID.incremental || itemTagsRID.incremental ) {
++  if ( itemTagsRID.incremental || itemTagsGID.incremental ) {
+     throw HandlerException( "Incremental tags changes are not allowed in AK-APPEND" );
+   }
+ 
diff -Nru akonadi-1.13.0/debian/patches/upstream-MOVEcomplete.patch akonadi1-1.13.0/debian/patches/upstream-MOVEcomplete.patch
--- akonadi-1.13.0/debian/patches/upstream-MOVEcomplete.patch	1970-01-01 01:00:00.000000000 +0100
+++ akonadi1-1.13.0/debian/patches/upstream-MOVEcomplete.patch	2015-09-02 10:07:54.000000000 +0200
@@ -0,0 +1,59 @@
+From abe71f46c3b2e657db25ac16c43a4c76b2212a9f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Dan=20Vr=C3=A1til?= <dvratil@redhat.com>
+Date: Wed, 17 Jun 2015 13:04:13 +0200
+Subject: [PATCH] Don't throw exception when MOVE handler finds no items to move
+
+Instead return "OK MOVE complete" right away. The reason for this is that
+when client tries to move an Item from a folder into the same folder (it's
+possible in KMail, also mailfilter agent might trigger this situation) the
+subsequent command gets eaten by ImapStreamParser and the client's Job gets
+stuck waiting for response forever. According to Laurent this could also fix
+the Mail Filter Agent getting stuck occasionally.
+
+The problem is in ImapStreamParser::atCommandEnd() method, which is called
+by the Move handler at some point. atCommandEnd() checks whether we reached
+command end in the stream by looking if the next characters in the stream
+are "\r\n" and if so it will consume the command end ("\r\n"), effectively
+moving the streaming position BEYOND the command. In case of MOVE the
+command has already been completely parsed so we are actually at the end of
+the command and so ImapStreamParser will consume the "\r\n" and position the
+stream beyond the command end.
+
+After that the Move handler tries to get the items from DB and throws the
+exception (the second part of the condition in the SQL query causes that
+the query yields no results in this situation)  which gets us back to
+Connection where we then call ImapStreamParser::skipCommand(). At this point
+however there are no more data in the stream (because atCommandEnd() moved
+us beyond the end of the MOVE command) and so ImapStreamParser will block
+and wait for more data (with 30 seconds timeout). If client sends another
+command within this time the ImapStreamParser will think that this is the
+command to be skipped and will consume it. This means that the command never
+really reaches the Connection as it's consumed as soon as it's captured by
+ImapStreamParser. And because Akonadi never receives the command it cannot
+send a response and thus the Job in client will wait forever and ever...
+
+Proper fix would be to make ImapStreamParser::atCommandEnd() to only peek
+instead of actually altering the position in the stream however I'm really
+afraid that it could break some other stuff that relies on this (broken?)
+behaviour and our test coverage is not sufficient at this point to be
+reliable enough.
+---
+ server/src/handler/move.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/server/src/handler/move.cpp b/server/src/handler/move.cpp
+index 0a6c3bf..4cf9d4e 100644
+--- a/server/src/handler/move.cpp
++++ b/server/src/handler/move.cpp
+@@ -85,7 +85,7 @@ bool Move::parseStream()
+   if ( qb.exec() ) {
+     const QVector<PimItem> items = qb.result();
+     if ( items.isEmpty() ) {
+-      throw HandlerException( "No items found" );
++      return successResponse( "MOVE complete" );
+     }
+ 
+     // Split the list by source collection
+-- 
+2.1.4
+
diff -Nru akonadi-1.13.0/debian/patches/upstream_opt-0002-intern-entity-strings.patch akonadi1-1.13.0/debian/patches/upstream_opt-0002-intern-entity-strings.patch
--- akonadi-1.13.0/debian/patches/upstream_opt-0002-intern-entity-strings.patch	1970-01-01 01:00:00.000000000 +0100
+++ akonadi1-1.13.0/debian/patches/upstream_opt-0002-intern-entity-strings.patch	2015-09-02 10:07:54.000000000 +0200
@@ -0,0 +1,176 @@
+From a04809a44c235bed854adc3bd49ca75b9673bf1f Mon Sep 17 00:00:00 2001
+From: Milian Wolff <mail@milianw.de>
+Date: Wed, 26 Nov 2014 13:20:05 +0100
+Subject: [PATCH] Intern entity strings for table and column names.
+
+This should drastically cut down on the amount of allocations done
+by the AkonadiServer. Currently, the getters will do the conversion
+from QLatin1String to QString on every call. By reusing the data
+via a function-local static const QString object, we can eliminate
+all of these allocations and increase the cache locality as well.
+
+REVIEW: 121255
+---
+ server/src/storage/entities-source.xsl | 56 +++++++++++++++++++++-------------
+ server/src/storage/entities.xsl        |  4 +--
+ 2 files changed, 36 insertions(+), 24 deletions(-)
+
+diff --git a/server/src/storage/entities-source.xsl b/server/src/storage/entities-source.xsl
+index 174cf4f..7090c31 100644
+--- a/server/src/storage/entities-source.xsl
++++ b/server/src/storage/entities-source.xsl
+@@ -214,36 +214,41 @@ void <xsl:value-of select="$className"/>::<xsl:call-template name="setter-signat
+ // SQL table information
+ <xsl:text>QString </xsl:text><xsl:value-of select="$className"/>::tableName()
+ {
+-  return QLatin1String( "<xsl:value-of select="$tableName"/>" );
++  static const QString tableName = QLatin1String( "<xsl:value-of select="$tableName"/>" );
++  return tableName;
+ }
+ 
+ QStringList <xsl:value-of select="$className"/>::columnNames()
+ {
+-  QStringList rv;
++  static const QStringList columns = QStringList()
+   <xsl:for-each select="column">
+-  rv.append( QLatin1String( "<xsl:value-of select="@name"/>" ) );
++    &lt;&lt; <xsl:value-of select="@name"/>Column()
+   </xsl:for-each>
+-  return rv;
++  ;
++  return columns;
+ }
+ 
+ QStringList <xsl:value-of select="$className"/>::fullColumnNames()
+ {
+-  QStringList rv;
++  static const QStringList columns = QStringList()
+   <xsl:for-each select="column">
+-  rv.append( QLatin1String( "<xsl:value-of select="$tableName"/>.<xsl:value-of select="@name"/>" ) );
++    &lt;&lt; <xsl:value-of select="@name"/>FullColumnName()
+   </xsl:for-each>
+-  return rv;
++  ;
++  return columns;
+ }
+ 
+ <xsl:for-each select="column">
+ QString <xsl:value-of select="$className"/>::<xsl:value-of select="@name"/>Column()
+ {
+-  return QLatin1String( "<xsl:value-of select="@name"/>" );
++  static const QString column = QLatin1String( "<xsl:value-of select="@name"/>" );
++  return column;
+ }
+ 
+ QString <xsl:value-of select="$className"/>::<xsl:value-of select="@name"/>FullColumnName()
+ {
+-  return tableName() + QLatin1String( ".<xsl:value-of select="@name"/>" );
++  static const QString column = QLatin1String( "<xsl:value-of select="$tableName"/>.<xsl:value-of select="@name"/>" );
++  return column;
+ }
+ </xsl:for-each>
+ 
+@@ -399,7 +404,6 @@ QVector&lt;<xsl:value-of select="@table"/>&gt; <xsl:value-of select="$className"
+ <xsl:variable name="relationName"><xsl:value-of select="@table1"/><xsl:value-of select="@table2"/>Relation</xsl:variable>
+ <xsl:variable name="rightSideClass"><xsl:value-of select="@table2"/></xsl:variable>
+ <xsl:variable name="rightSideEntity"><xsl:value-of select="@table2"/></xsl:variable>
+-<xsl:variable name="rightSideTable"><xsl:value-of select="@table2"/>Table</xsl:variable>
+ 
+ // data retrieval for n:m relations
+ QVector&lt;<xsl:value-of select="$rightSideClass"/>&gt; <xsl:value-of select="$className"/>::<xsl:value-of select="concat(translate(substring(@table2,1,1),'ABCDEFGHIJKLMNOPQRSTUVWXYZ','abcdefghijklmnopqrstuvwxyz'), substring(@table2,2))"/>s() const
+@@ -408,14 +412,17 @@ QVector&lt;<xsl:value-of select="$rightSideClass"/>&gt; <xsl:value-of select="$c
+   if ( !db.isOpen() )
+     return QVector&lt;<xsl:value-of select="$rightSideClass"/>&gt;();
+ 
+-  QueryBuilder qb( QLatin1String("<xsl:value-of select="$rightSideTable"/>"), QueryBuilder::Select );
++  QueryBuilder qb( <xsl:value-of select="$rightSideClass"/>::tableName(), QueryBuilder::Select );
++  static const QStringList columns = QStringList()
+   <xsl:for-each select="/database/table[@name = $rightSideEntity]/column">
+-    qb.addColumn( QLatin1String("<xsl:value-of select="$rightSideTable"/>.<xsl:value-of select="@name"/>" ) );
++    &lt;&lt; <xsl:value-of select="$rightSideClass"/>::<xsl:value-of select="@name"/>FullColumnName()
+   </xsl:for-each>
+-  qb.addJoin( QueryBuilder::InnerJoin, QLatin1String("<xsl:value-of select="$relationName"/>"),
+-              QLatin1String("<xsl:value-of select="$relationName"/>.<xsl:value-of select="@table2"/>_<xsl:value-of select="@column2"/>"),
+-              QLatin1String("<xsl:value-of select="$rightSideTable"/>.<xsl:value-of select="@column2"/>") );
+-  qb.addValueCondition( QLatin1String("<xsl:value-of select="$relationName"/>.<xsl:value-of select="@table1"/>_<xsl:value-of select="@column1"/>"), Query::Equals, id() );
++  ;
++  qb.addColumns(columns);
++  qb.addJoin( QueryBuilder::InnerJoin, <xsl:value-of select="$relationName"/>::tableName(),
++              <xsl:value-of select="$relationName"/>::rightFullColumnName(),
++              <xsl:value-of select="$rightSideClass"/>::<xsl:value-of select="@column2"/>FullColumnName() );
++  qb.addValueCondition( <xsl:value-of select="$relationName"/>::leftFullColumnName(), Query::Equals, id() );
+ 
+   if ( !qb.exec() ) {
+     akDebug() &lt;&lt; "Error during selection of records from table <xsl:value-of select="@table1"/><xsl:value-of select="@table2"/>Relation"
+@@ -546,7 +553,7 @@ bool <xsl:value-of select="$className"/>::update()
+   </xsl:for-each>
+ 
+   <xsl:if test="column[@name = 'id']">
+-  qb.addValueCondition( QLatin1String("id"), Query::Equals, id() );
++  qb.addValueCondition( idColumn(), Query::Equals, id() );
+   </xsl:if>
+ 
+   if ( !qb.exec() ) {
+@@ -622,27 +629,32 @@ void <xsl:value-of select="$className"/>::enableCache( bool enable )
+ // SQL table information
+ QString <xsl:value-of select="$className"/>::tableName()
+ {
+-  return QLatin1String( "<xsl:value-of select="$tableName"/>" );
++  static const QString table = QLatin1String( "<xsl:value-of select="$tableName"/>" );
++  return table;
+ }
+ 
+ QString <xsl:value-of select="$className"/>::leftColumn()
+ {
+-  return QLatin1String( "<xsl:value-of select="@table1"/>_<xsl:value-of select="@column1"/>" );
++  static const QString column = QLatin1String( "<xsl:value-of select="@table1"/>_<xsl:value-of select="@column1"/>" );
++  return column;
+ }
+ 
+ QString <xsl:value-of select="$className"/>::leftFullColumnName()
+ {
+-  return tableName() + QLatin1String( "." ) + leftColumn();
++  static const QString column = QLatin1String( "<xsl:value-of select="$tableName"/>.<xsl:value-of select="@table1"/>_<xsl:value-of select="@column1"/>" );
++  return column;
+ }
+ 
+ QString <xsl:value-of select="$className"/>::rightColumn()
+ {
+-  return QLatin1String( "<xsl:value-of select="@table2"/>_<xsl:value-of select="@column2"/>" );
++  static const QString column = QLatin1String( "<xsl:value-of select="@table2"/>_<xsl:value-of select="@column2"/>" );
++  return column;
+ }
+ 
+ QString <xsl:value-of select="$className"/>::rightFullColumnName()
+ {
+-  return tableName() + QLatin1String( "." ) + rightColumn();
++  static const QString column = QLatin1String( "<xsl:value-of select="$tableName"/>.<xsl:value-of select="@table2"/>_<xsl:value-of select="@column2"/>" );
++  return column;
+ }
+ </xsl:template>
+ 
+diff --git a/server/src/storage/entities.xsl b/server/src/storage/entities.xsl
+index 033e292..8b0ed03 100644
+--- a/server/src/storage/entities.xsl
++++ b/server/src/storage/entities.xsl
+@@ -114,7 +114,7 @@ using namespace Akonadi::Server;
+ 
+ QVector&lt;QString&gt; Akonadi::Server::allDatabaseTables()
+ {
+-  static QVector&lt;QString&gt; allTables = QVector&lt;QString&gt;()
++  static const QVector&lt;QString&gt; allTables = QVector&lt;QString&gt;()
+   <xsl:for-each select="database/table">
+     &lt;&lt; QLatin1String( "<xsl:value-of select="@name"/>Table" )
+   </xsl:for-each>
+@@ -182,7 +182,7 @@ set<xsl:value-of select="$methodName"/>( <xsl:call-template name="argument"/> )
+ 
+   QueryBuilder qb( tableName(), QueryBuilder::Select );
+   qb.addColumns( columnNames() );
+-  qb.addValueCondition( QLatin1String("<xsl:value-of select="$key"/>"), Query::Equals, <xsl:value-of select="$key"/> );
++  qb.addValueCondition( <xsl:value-of select="$key"/>Column(), Query::Equals, <xsl:value-of select="$key"/> );
+   if ( !qb.exec() ) {
+     akDebug() &lt;&lt; "Error during selection of record with <xsl:value-of select="$key"/>"
+       &lt;&lt; <xsl:value-of select="$key"/> &lt;&lt; "from table" &lt;&lt; tableName()
+-- 
+2.1.4
+
diff -Nru akonadi-1.13.0/debian/patches/upstream_opt-0003-QMutexLocker.patch akonadi1-1.13.0/debian/patches/upstream_opt-0003-QMutexLocker.patch
--- akonadi-1.13.0/debian/patches/upstream_opt-0003-QMutexLocker.patch	1970-01-01 01:00:00.000000000 +0100
+++ akonadi1-1.13.0/debian/patches/upstream_opt-0003-QMutexLocker.patch	2015-09-02 10:07:54.000000000 +0200
@@ -0,0 +1,112 @@
+From f5a0e3f1f4787b6a48880e42463ae38dce336a8f Mon Sep 17 00:00:00 2001
+From: Milian Wolff <mail@milianw.de>
+Date: Mon, 1 Dec 2014 11:36:31 +0100
+Subject: [PATCH] Use QMutexLocker instead of manual lock/unlock calls.
+
+Just a minor cleanup patch, no change of behavior.
+---
+ server/src/storage/entities-source.xsl | 17 +++++------------
+ server/src/storage/entities.xsl        |  4 +---
+ 2 files changed, 6 insertions(+), 15 deletions(-)
+
+diff --git a/server/src/storage/entities-source.xsl b/server/src/storage/entities-source.xsl
+index 7090c31..05a8cb1 100644
+--- a/server/src/storage/entities-source.xsl
++++ b/server/src/storage/entities-source.xsl
+@@ -125,14 +125,13 @@ void <xsl:value-of select="$className"/>::Private::addToCache( const <xsl:value-
+ {
+   Q_ASSERT( cacheEnabled );
+   Q_UNUSED( entry ); <!-- in case the table has neither an id nor name column -->
+-  cacheMutex.lock();
++  QMutexLocker lock(&amp;cacheMutex);
+   <xsl:if test="column[@name = 'id']">
+   idCache.insert( entry.id(), entry );
+   </xsl:if>
+   <xsl:if test="column[@name = 'name']">
+   nameCache.insert( entry.name(), entry );
+   </xsl:if>
+-  cacheMutex.unlock();
+ }
+ 
+ 
+@@ -264,12 +263,10 @@ int <xsl:value-of select="$className"/>::count( const QString &amp;column, const
+ bool <xsl:value-of select="$className"/>::exists( qint64 id )
+ {
+   if ( Private::cacheEnabled ) {
+-    Private::cacheMutex.lock();
++    QMutexLocker lock(&amp;Private::cacheMutex);
+     if ( Private::idCache.contains( id ) ) {
+-      Private::cacheMutex.unlock();
+       return true;
+     }
+-    Private::cacheMutex.unlock();
+   }
+   return count( idColumn(), id ) > 0;
+ }
+@@ -278,12 +275,10 @@ bool <xsl:value-of select="$className"/>::exists( qint64 id )
+ bool <xsl:value-of select="$className"/>::exists( const <xsl:value-of select="column[@name = 'name']/@type"/> &amp;name )
+ {
+   if ( Private::cacheEnabled ) {
+-    Private::cacheMutex.lock();
++    QMutexLocker lock(&amp;Private::cacheMutex);
+     if ( Private::nameCache.contains( name ) ) {
+-      Private::cacheMutex.unlock();
+       return true;
+     }
+-    Private::cacheMutex.unlock();
+   }
+   return count( nameColumn(), name ) > 0;
+ }
+@@ -588,28 +583,26 @@ bool <xsl:value-of select="$className"/>::remove( qint64 id )
+ void <xsl:value-of select="$className"/>::invalidateCache() const
+ {
+   if ( Private::cacheEnabled ) {
+-    Private::cacheMutex.lock();
++    QMutexLocker lock(&amp;Private::cacheMutex);
+     <xsl:if test="column[@name = 'id']">
+     Private::idCache.remove( id() );
+     </xsl:if>
+     <xsl:if test="column[@name = 'name']">
+     Private::nameCache.remove( name() );
+     </xsl:if>
+-    Private::cacheMutex.unlock();
+   }
+ }
+ 
+ void <xsl:value-of select="$className"/>::invalidateCompleteCache()
+ {
+   if ( Private::cacheEnabled ) {
+-    Private::cacheMutex.lock();
++    QMutexLocker lock(&amp;Private::cacheMutex);
+     <xsl:if test="column[@name = 'id']">
+     Private::idCache.clear();
+     </xsl:if>
+     <xsl:if test="column[@name = 'name']">
+     Private::nameCache.clear();
+     </xsl:if>
+-    Private::cacheMutex.unlock();
+   }
+ }
+ 
+diff --git a/server/src/storage/entities.xsl b/server/src/storage/entities.xsl
+index 8b0ed03..a397544 100644
+--- a/server/src/storage/entities.xsl
++++ b/server/src/storage/entities.xsl
+@@ -167,13 +167,11 @@ set<xsl:value-of select="$methodName"/>( <xsl:call-template name="argument"/> )
+ <xsl:variable name="className"><xsl:value-of select="@name"/></xsl:variable>
+   <xsl:if test="$cache != ''">
+   if ( Private::cacheEnabled ) {
+-    Private::cacheMutex.lock();
++    QMutexLocker lock(&amp;Private::cacheMutex);
+     if ( Private::<xsl:value-of select="$cache"/>.contains( <xsl:value-of select="$key"/> ) ) {
+       const <xsl:value-of select="$className"/> tmp = Private::<xsl:value-of select="$cache"/>.value( <xsl:value-of select="$key"/> );
+-      Private::cacheMutex.unlock();
+       return tmp;
+     }
+-    Private::cacheMutex.unlock();
+   }
+   </xsl:if>
+   QSqlDatabase db = DataStore::self()->database();
+-- 
+2.1.4
+
diff -Nru akonadi-1.13.0/debian/patches/upstream_opt-0004-one-hash-lookup.patch akonadi1-1.13.0/debian/patches/upstream_opt-0004-one-hash-lookup.patch
--- akonadi-1.13.0/debian/patches/upstream_opt-0004-one-hash-lookup.patch	1970-01-01 01:00:00.000000000 +0100
+++ akonadi1-1.13.0/debian/patches/upstream_opt-0004-one-hash-lookup.patch	2015-09-02 10:07:54.000000000 +0200
@@ -0,0 +1,32 @@
+From 202ffa522668087cc133026febf21a7de8963218 Mon Sep 17 00:00:00 2001
+From: Milian Wolff <mail@milianw.de>
+Date: Mon, 1 Dec 2014 11:51:04 +0100
+Subject: [PATCH] Optimize: Only do one hash lookup to retrieve value from
+ cache.
+
+Compilers do not merge the call to contains() and the successive
+value() lookup. Using iterators thus saves us one QHash lookup.
+---
+ server/src/storage/entities.xsl | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/server/src/storage/entities.xsl b/server/src/storage/entities.xsl
+index a397544..9471293 100644
+--- a/server/src/storage/entities.xsl
++++ b/server/src/storage/entities.xsl
+@@ -168,9 +168,9 @@ set<xsl:value-of select="$methodName"/>( <xsl:call-template name="argument"/> )
+   <xsl:if test="$cache != ''">
+   if ( Private::cacheEnabled ) {
+     QMutexLocker lock(&amp;Private::cacheMutex);
+-    if ( Private::<xsl:value-of select="$cache"/>.contains( <xsl:value-of select="$key"/> ) ) {
+-      const <xsl:value-of select="$className"/> tmp = Private::<xsl:value-of select="$cache"/>.value( <xsl:value-of select="$key"/> );
+-      return tmp;
++    QHash&lt;<xsl:value-of select="column[@name = $key]/@type"/>, <xsl:value-of select="$className"/>&gt;::const_iterator it = Private::<xsl:value-of select="$cache"/>.constFind(<xsl:value-of select="$key"/>);
++    if ( it != Private::<xsl:value-of select="$cache"/>.constEnd() ) {
++      return it.value();
+     }
+   }
+   </xsl:if>
+-- 
+2.1.4
+
diff -Nru akonadi-1.13.0/debian/patches/upstream_opt-0005-optimize-queries.patch akonadi1-1.13.0/debian/patches/upstream_opt-0005-optimize-queries.patch
--- akonadi-1.13.0/debian/patches/upstream_opt-0005-optimize-queries.patch	1970-01-01 01:00:00.000000000 +0100
+++ akonadi1-1.13.0/debian/patches/upstream_opt-0005-optimize-queries.patch	2015-09-02 10:07:54.000000000 +0200
@@ -0,0 +1,107 @@
+From e52b57b7a9f0303c0c710e60870d0ec265d32541 Mon Sep 17 00:00:00 2001
+From: Milian Wolff <mail@milianw.de>
+Date: Mon, 1 Dec 2014 14:11:19 +0100
+Subject: [PATCH] Optimize queries: Do not retrieve known key used in the
+ condition.
+
+There is no point in doing a select like:
+
+SELECT foo, bar FROM table WHERE foo = needle;
+
+That can be rewritten to say
+
+SELECT bar FROM table WHERE foo = needle;
+
+This reduces the data traffic with the mysql server. Additionally, it
+work-arounds some issues in Qt SQL, which lead to bad performance:
+QSqlResult::value incurs multiple temporary allocations, and string
+conversions, even to read a simple integer ID for example. Finally,
+by reusing an externally provided QString name e.g., we can leverage
+Qt's implicit sharing, instead of duplicating the string in a separate
+QString instance, with the contents read from SQL server.
+
+REVIEW: 121310
+---
+ server/src/storage/entities.xsl | 50 +++++++++++++++++++++++++++++------------
+ 1 file changed, 36 insertions(+), 14 deletions(-)
+
+diff --git a/server/src/storage/entities.xsl b/server/src/storage/entities.xsl
+index 9471293..c8fb1fd 100644
+--- a/server/src/storage/entities.xsl
++++ b/server/src/storage/entities.xsl
+@@ -104,6 +104,12 @@ Q_DECLARE_TYPEINFO( Akonadi::Server::<xsl:value-of select="@name"/>, Q_MOVABLE_T
+ 
+ using namespace Akonadi::Server;
+ 
++static QStringList removeEntry(QStringList list, const QString&amp; entry)
++{
++  list.removeOne(entry);
++  return list;
++}
++
+ <xsl:for-each select="database/table">
+ <xsl:call-template name="table-source"/>
+ </xsl:for-each>
+@@ -179,7 +185,8 @@ set<xsl:value-of select="$methodName"/>( <xsl:call-template name="argument"/> )
+     return <xsl:value-of select="$className"/>();
+ 
+   QueryBuilder qb( tableName(), QueryBuilder::Select );
+-  qb.addColumns( columnNames() );
++  static const QStringList columns = removeEntry(columnNames(), <xsl:value-of select="$key"/>Column());
++  qb.addColumns( columns );
+   qb.addValueCondition( <xsl:value-of select="$key"/>Column(), Query::Equals, <xsl:value-of select="$key"/> );
+   if ( !qb.exec() ) {
+     akDebug() &lt;&lt; "Error during selection of record with <xsl:value-of select="$key"/>"
+@@ -191,21 +198,36 @@ set<xsl:value-of select="$methodName"/>( <xsl:call-template name="argument"/> )
+     return <xsl:value-of select="$className"/>();
+   }
+ 
++  <!-- this indirection is required to prevent off-by-one access now that we skip the key column -->
++  int valueIndex = 0;
++  <xsl:for-each select="column">
++    const <xsl:value-of select="@type"/> value<xsl:value-of select="position()"/> =
++    <xsl:choose>
++      <xsl:when test="@name=$key">
++        <xsl:value-of select="$key"/>;
++      </xsl:when>
++      <xsl:otherwise>
++        (qb.query().isNull(valueIndex)) ?
++        <xsl:value-of select="@type"/>() :
++        <xsl:choose>
++          <xsl:when test="starts-with(@type,'QString')">
++          Utils::variantToString( qb.query().value( valueIndex ) )
++          </xsl:when>
++          <xsl:when test="starts-with(@type, 'Tristate')">
++          static_cast&lt;Tristate&gt;(qb.query().value( valueIndex ).value&lt;int&gt;())
++          </xsl:when>
++          <xsl:otherwise>
++          qb.query().value( valueIndex ).value&lt;<xsl:value-of select="@type"/>&gt;()
++          </xsl:otherwise>
++        </xsl:choose>
++        ; ++valueIndex;
++      </xsl:otherwise>
++    </xsl:choose>
++  </xsl:for-each>
++
+   <xsl:value-of select="$className"/> rv(
+   <xsl:for-each select="column">
+-    (qb.query().isNull(<xsl:value-of select="position() - 1"/>)) ?
+-      <xsl:value-of select="@type"/>() :
+-      <xsl:choose>
+-        <xsl:when test="starts-with(@type,'QString')">
+-      Utils::variantToString( qb.query().value( <xsl:value-of select="position() - 1"/> ) )
+-        </xsl:when>
+-        <xsl:when test="starts-with(@type, 'Tristate')">
+-      static_cast&lt;Tristate&gt;(qb.query().value( <xsl:value-of select="position() - 1"/> ).value&lt;int&gt;())
+-        </xsl:when>
+-        <xsl:otherwise>
+-      qb.query().value( <xsl:value-of select="position() - 1"/> ).value&lt;<xsl:value-of select="@type"/>&gt;()
+-        </xsl:otherwise>
+-      </xsl:choose>
++    value<xsl:value-of select="position()"/>
+     <xsl:if test="position() != last()">,</xsl:if>
+   </xsl:for-each>
+   );
+-- 
+2.1.4
+
diff -Nru akonadi-1.13.0/debian/patches/upstream-prevent-QTimer-negative-interval.patch akonadi1-1.13.0/debian/patches/upstream-prevent-QTimer-negative-interval.patch
--- akonadi-1.13.0/debian/patches/upstream-prevent-QTimer-negative-interval.patch	1970-01-01 01:00:00.000000000 +0100
+++ akonadi1-1.13.0/debian/patches/upstream-prevent-QTimer-negative-interval.patch	2015-09-02 10:07:54.000000000 +0200
@@ -0,0 +1,27 @@
+From de9bd9043e8878fc472ced1669bc7d49b07c2062 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ren=C3=A9=20J=2EV=2E=20Bertin?= <rjvbertin@gmail.com>
+Date: Mon, 3 Nov 2014 16:56:56 +0100
+Subject: [PATCH] prevent starting a QTimer with a negative interval
+ Review: 120800
+
+---
+ server/src/collectionscheduler.cpp | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/server/src/collectionscheduler.cpp b/server/src/collectionscheduler.cpp
+index 8d4cd5c..9ba632f 100644
+--- a/server/src/collectionscheduler.cpp
++++ b/server/src/collectionscheduler.cpp
+@@ -82,7 +82,8 @@ class PauseableTimer : public QTimer
+         return;
+       }
+ 
+-      start( interval() - ( mStarted.secsTo( mPaused ) * 1000 ) );
++      const int remainder = interval() - ( mStarted.secsTo( mPaused ) * 1000 );
++      start( qMax( 0, remainder ) );
+       mPaused = QDateTime();
+       // Update mStarted so that pause() can be called repeatedly
+       mStarted = QDateTime::currentDateTime();
+-- 
+2.1.4
+
diff -Nru akonadi-1.13.0/debian/patches/upstream-use-QAtomicInt.patch akonadi1-1.13.0/debian/patches/upstream-use-QAtomicInt.patch
--- akonadi-1.13.0/debian/patches/upstream-use-QAtomicInt.patch	1970-01-01 01:00:00.000000000 +0100
+++ akonadi1-1.13.0/debian/patches/upstream-use-QAtomicInt.patch	2015-09-02 10:07:54.000000000 +0200
@@ -0,0 +1,37 @@
+From 8a113985cda1693c8158916065bd54e57d028cda Mon Sep 17 00:00:00 2001
+From: Milian Wolff <mail@milianw.de>
+Date: Mon, 1 Dec 2014 11:39:33 +0100
+Subject: [PATCH] Use an QAtomicInt instead of a plain bool for
+ Entity::cacheEnabled.
+
+A plain bool is not thread safe and leads to undefined behavior.
+So better be safe than sorry and use a thread safe QAtomicInt.
+---
+ server/src/storage/entities-source.xsl | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/server/src/storage/entities-source.xsl b/server/src/storage/entities-source.xsl
+index 05a8cb1..e398da5 100644
+--- a/server/src/storage/entities-source.xsl
++++ b/server/src/storage/entities-source.xsl
+@@ -99,7 +99,7 @@ class <xsl:value-of select="$className"/>::Private : public QSharedData
+     static void addToCache( const <xsl:value-of select="$className"/> &amp; entry );
+ 
+     // cache
+-    static bool cacheEnabled;
++    static QAtomicInt cacheEnabled;
+     static QMutex cacheMutex;
+     <xsl:if test="column[@name = 'id']">
+     static QHash&lt;qint64, <xsl:value-of select="$className"/> &gt; idCache;
+@@ -111,7 +111,7 @@ class <xsl:value-of select="$className"/>::Private : public QSharedData
+ 
+ 
+ // static members
+-bool <xsl:value-of select="$className"/>::Private::cacheEnabled = false;
++QAtomicInt <xsl:value-of select="$className"/>::Private::cacheEnabled(0);
+ QMutex <xsl:value-of select="$className"/>::Private::cacheMutex;
+ <xsl:if test="column[@name = 'id']">
+ QHash&lt;qint64, <xsl:value-of select="$className"/> &gt; <xsl:value-of select="$className"/>::Private::idCache;
+-- 
+2.1.4
+
diff -Nru akonadi-1.13.0/debian/rules akonadi1-1.13.0/debian/rules
--- akonadi-1.13.0/debian/rules	2015-04-15 21:50:51.000000000 +0200
+++ akonadi1-1.13.0/debian/rules	2015-09-02 10:07:54.000000000 +0200
@@ -7,27 +7,16 @@
 libpkgs_gen_strict_local_shlibs = $(libpkgs_all_packages)
 include /usr/share/pkg-kde-tools/qt-kde-team/2/library-packages.mk
 
-backend_packages = $(filter akonadi-backend-%,$(shell dh_listpackages))
-
 override_dh_auto_configure:
 	$(overridden_command) -- -DMYSQLD_EXECUTABLE:STRING=/usr/sbin/mysqld-akonadi \
 	    -DINSTALL_QSQLITE_IN_QT_PREFIX=ON \
 	    -DCONFIG_INSTALL_DIR=/etc
 
-override_dh_installinit:
-	$(overridden_command)
-	dh_apparmor -pakonadi-backend-mysql --profile-name=usr.sbin.mysqld-akonadi
-
-override_dh_installdocs:
-	# Install README.Debian to backend packages
-	$(overridden_command) -A -pakonadi-server $(foreach p,$(backend_packages),-p$(p)) debian/README.Debian
-	$(overridden_command) --remaining-packages
-
 override_dh_makeshlibs:
 	$(overridden_command) -V -- -c0
 
 override_dh_strip:
-	$(overridden_command) --dbg-package=akonadi-dbg
+	$(overridden_command) --dbg-package=akonadi1-dbg
 
 override_dh_auto_test:
 	# Avoid tests extra build dependencies, check them with autopkgtests
diff -Nru akonadi-1.13.0/debian/usr.sbin.mysqld-akonadi akonadi1-1.13.0/debian/usr.sbin.mysqld-akonadi
--- akonadi-1.13.0/debian/usr.sbin.mysqld-akonadi	2014-11-03 15:02:28.000000000 +0100
+++ akonadi1-1.13.0/debian/usr.sbin.mysqld-akonadi	1970-01-01 01:00:00.000000000 +0100
@@ -1,33 +0,0 @@
-# vim:syntax=apparmor
-
-#include <tunables/global>
-
-/usr/sbin/mysqld-akonadi {
-  #include <abstractions/base>
-
-  /usr/sbin/mysqld-akonadi r,
-  /usr/sbin/mysqld cx,
-
-  profile /usr/sbin/mysqld {
-    #include <abstractions/base>
-    #include <abstractions/nameservice>
-    #include <abstractions/user-tmp>
-
-    capability setgid,
-    capability setuid,
-
-    /etc/mysql/conf.d/ r,
-    /etc/mysql/conf.d/* r,
-    /etc/mysql/my.cnf r,
-
-    /sys/devices/system/cpu/ r,
-
-    /usr/sbin/mysqld mr,
-    /usr/share/mysql/** r,
-
-    @{HOME}/.local/share/akonadi/** rwk,
-
-    # Site-specific additions and overrides. See local/README for details.
-    #include <local/usr.sbin.mysqld-akonadi>
-  }
-}