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

[Scarlett Clark]

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

The following commit has been merged in the kubuntu_xenial_archive branch:
commit 52f636bdf88da960fe63deb3a651ed3f7d0a42f9
Merge: 11f0d5ea27abd0d4c32f9b45ffe66e09cace42d9 7a50e503d991198894a151a3d60f1cef8b9c63d3
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Thu Mar 10 06:54:02 2016 -0800

     * 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
    
     * 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

 debian/changelog | 12 ++++++++++--
 debian/control   |  6 +++---
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --cc debian/changelog
index 64f1813,ebbd46b..92539d8
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,11 +1,17 @@@
 +akonadi (4:15.12.2-0ubuntu1) UNRELEASED; urgency=medium
- 
++  
 +  * New upstream bugfix release
- 
++    
 + -- Scarlett Clark <sgclark at kubuntu.org>  Wed, 09 Mar 2016 20:37:31 -0800
 +
+ 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 ]

-- 
Akonadi packaging