New upstream release

* New upstream release
* Manual merge.
* Add versions to dependencies. Fix merge.
* Fix merger in patch.
* Fix merge in series
* Update the Vcs URLs now that the repositories are hosted on
  Launchpad
* Fix symbols file.
* Debian merge: Remaining changes:
  mysql-server version.
*

1 files changed, 112 insertions, 7 deletions

diff --git a/debian/control b/debian/control
index 6090538..6f0cb6c 100644
--- a/debian/control
+++ b/debian/control
@@ -10,12 +10,22 @@ Build-Depends: automoc,
                cmake (>= 2.8.12~),
                debhelper (>= 9),
                dh-apparmor,
-               extra-cmake-modules (>= 5.21.0~),
-               kgendesignerplugin (>= 5.21.0~),
-               kio-dev (>= 5.21.0~),
+               extra-cmake-modules (>= 5.16.0~),
+               kdesignerplugin (>= 5.16.0~),
+               kgendesignerplugin,
+               kio-dev (>= 5.16.0~),
+               libkf5completion-dev (>= 5.16.0~),
+               libkf5config-dev (>= 5.16.0~),
+               libkf5dbusaddons-dev (>= 5.16.0~),
+               libkf5guiaddons-dev (>= 5.16.0~),
+               libkf5i18n-dev (>= 5.16.0~),
+               libkf5iconthemes-dev (>= 5.16.0~),
+               libkf5itemmodels-dev (>= 5.16.0~),
+               libkf5itemviews-dev (>= 5.16.0~),
+               libkf5windowsystem-dev (>= 5.16.0~),
                libboost-dev (>= 1.34.0~),
-               libkf5itemmodels-dev (>= 5.21.0~),
-               libkf5itemviews-dev (>= 5.21.0~),
+               libxslt1-dev,
+               libxml2-dev,
                libmysqlclient-dev,
                libqt5designer5,
                libsqlite3-dev (>= 3.6.23),
@@ -24,11 +34,11 @@ Build-Depends: automoc,
                libxslt1-dev,
                pkg-config,
                pkg-kde-tools (>= 0.12),
-               qtbase5-dev (>= 5.2.0),
+               qtbase5-dev (>= 5.4.0~),
                qttools5-dev,
                shared-mime-info (>= 0.20),
                xsltproc
-Standards-Version: 3.9.6
+Standards-Version: 3.9.8
 Homepage: http://pim.kde.org/akonadi
 Vcs-Browser: https://code.launchpad.net/~kubuntu-packagers/kubuntu-packaging/+git/akonadi
 Vcs-Git: git://git.launchpad.net/~kubuntu-packagers/kubuntu-packaging/+git/akonadi
@@ -43,6 +53,8 @@ Breaks: kdepimlibs-bin (<< 15.12.1~)
 Replaces: kdepimlibs-bin (<< 15.12.1~)
 Suggests: akonadi-backend-postgresql (= ${source:Version}),
           akonadi-backend-sqlite (= ${binary:Version})
+Breaks: kdepimlibs-data (<<  4:16.04), libakonadi-kde4
+Replaces: kdepimlibs-data (<<  4:16.04), libakonadi-kde4
 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
@@ -50,6 +62,99 @@ Description: Akonadi PIM storage service
  .
  This package contains the Akonadi PIM storage server and associated programs.
 
+Package: libkf5akonadi-dev
+Section: libdevel
+Architecture: any
+Multi-Arch: foreign
+Depends: libboost-dev (>= 1.34.0~),
+         libkf5akonadiagentbase5 (= ${binary:Version}),
+         libkf5akonadicore5 (= ${binary:Version}),
+         libkf5akonadiserver-dev (>= ${binary:Version}),
+         libkf5akonadiwidgets5 (= ${binary:Version}),
+         libkf5akonadixml5 (= ${binary:Version}),
+         libkf5completion-dev (>= 5.16.0~),
+         libkf5itemmodels-dev (>= 5.16.0~),
+         libkf5jobwidgets-dev,
+         libkf5kdelibs4support-dev (>= 5.12.0~),
+         libkf5service-dev,
+         libkf5solid-dev (>= 5.12.0~),
+         libkf5xmlgui-dev (>= 5.16.0~),
+         qtbase5-dev (>= 5.4.0~),
+         ${misc:Depends},
+         ${shlibs:Depends}
+Replaces: kdepim-runtime (<< 4:4.13), kdepimlibs5-dev (<< 4.14.10-1ubuntu2~)
+Breaks: kdepim-runtime (<< 4:4.13), kdepimlibs5-dev (<< 4.14.10-1ubuntu2~)
+Description: development files for the KDE Development Platform PIM libraries
+ This package contains development files for building software that uses
+ the KDE Development Platform Personal Information Management libraries.
+ .
+ This package is part of the KDE Development Platform PIM libraries module.
+
+Package: libkf5akonadi-dev-bin
+Section: libdevel
+Architecture: any
+Multi-Arch: foreign
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Breaks: kdepimlibs5-dev
+Replaces: kdepimlibs5-dev
+Description: Additional development binaries for the Akonadi KDE PIM libraries
+ This package contains development files for building software that uses
+ the KDE Development Platform Personal Information Management libraries.
+ .
+ This package is part of the KDE Development Platform PIM libraries module.
+
+Package: libkf5akonadiagentbase5
+Architecture: any
+Multi-Arch: same
+Depends: kdepimlibs-data (>= 4:15.12~),
+         ${misc:Depends},
+         ${shlibs:Depends}
+Description: Akonadi agent base library
+ This library contains classes to implement agents for the Akonadi PIM
+ data server.
+ .
+ This package is part of the KDE Development Platform PIM libraries module.
+
+Package: libkf5akonadicore5
+Architecture: any
+Multi-Arch: same
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Recommends: libkf5akonadiwidgets5 (= ${binary:Version})
+Description: Akonadi core library
+ This library contains Akonadi PIM data server core classes.
+ .
+ This package is part of the KDE Development Platform PIM libraries module.
+
+Package: libkf5akonadicore-bin
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: Tools for Akonadi core library
+ Tools used by Akonadi PIM data server core classes.
+ .
+ This package is part of the KDE Development Platform PIM libraries module.
+
+Package: libkf5akonadiwidgets5
+Architecture: any
+Multi-Arch: same
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Breaks: libkf5akonadicore5 (<< 4:15.07.90+git20150817.0936)
+Replaces: libkf5akonadicore5 (<< 4:15.07.90+git20150817.0936)
+Description: Akonadi widgets library
+ This library contains standard widgets for the Akonadi PIM data server.
+ .
+ This package is part of the KDE Development Platform PIM libraries module.
+
+Package: libkf5akonadixml5
+Architecture: any
+Multi-Arch: same
+Depends: kdepimlibs-data (>= 4:15.12~),
+         ${misc:Depends},
+         ${shlibs:Depends}
+Description: Akonadi XML helper library
+ This library provides XML helpers using the Akonadi PIM data server.
+ .
+ This package is part of the KDE Development Platform PIM libraries module.
+
 Package: libkf5akonadiprivate5
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}