[SCM] Akonadi packaging branch, kubuntu_xenial_archive, updated. ubuntu/4%15.12.1-0ubuntu2

[Philip Muškovac]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/akonadi.git;a=commitdiff;h=7a50e50

The following commit has been merged in the kubuntu_xenial_archive branch:
commit 7a50e503d991198894a151a3d60f1cef8b9c63d3
Author: Philip Muškovac <yofel at gmx.net>
Date:   Thu Mar 10 13:22:52 2016 +0100

    Fix the broken debian merge
    
    make akonadi-backend-mysql a hard-dep for akonadi-server
    make akonadi-backend-mysql dep on mysql server core
---
 debian/changelog | 8 ++++++++
 debian/control   | 6 +++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 822ceae..ebbd46b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+akonadi (4:15.12.1-0ubuntu2) xenial; urgency=medium
+
+  * Fix the broken debian merge:
+    - make akonadi-backend-mysql a hard-dep for akonadi-server
+    - make akonadi-backend-mysql dep on mysql server core
+
+ -- Philip Muškovac <yofel at kubuntu.org>  Thu, 10 Mar 2016 13:16:40 +0100
+
 akonadi (4:15.12.1-0ubuntu1) xenial; urgency=medium
 
   [ Clive Johnston ]
diff --git a/debian/control b/debian/control
index 3fbab3b..9eb654f 100644
--- a/debian/control
+++ b/debian/control
@@ -27,13 +27,12 @@ Vcs-Git: git://anonscm.debian.org/pkg-kde/applications/akonadi.git
 Package: akonadi-server
 Section: net
 Architecture: any
-Depends: akonadi-backend-mysql (= ${source:Version}) | akonadi-backend-sqlite (= ${binary:Version}) | akonadi-backend-postgresql (= ${source:Version}),
+Depends: akonadi-backend-mysql (= ${source:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
 Breaks: kdepimlibs-bin (<< 15.12.1~)
 Replaces: kdepimlibs-bin (<< 15.12.1~)
-Suggests: akonadi-backend-mysql (= ${source:Version}),
-          akonadi-backend-postgresql (= ${source:Version}),
+Suggests: 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)
@@ -72,6 +71,7 @@ Section: misc
 Architecture: all
 Depends: libqt5sql5-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~)

-- 
Akonadi packaging