[SCM] Akonadi packaging branch, kubuntu_unstable, updated. debian/15.08.0-1-40-g31b339b

[Scarlett Clark]

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

The following commit has been merged in the kubuntu_unstable branch:
commit 31b339b3e66f33e0053ff7fa3dd2d8805ed2472e
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Tue Mar 1 07:42:17 2016 -0800

    Add breaks/replace to akonadi-server. Contains file migrated from kdepimlibs-bin.
---
 debian/changelog | 4 ++++
 debian/control   | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 6d1e536..05c06e3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -32,6 +32,10 @@ akonadi (4:15.12.1-0ubuntu1) UNRELEASED; urgency=medium
     from previous commit
   * Fixing control file for libkf5akonadiserver-dev
 
+  [ Scarlett Clark ]
+  * Add breaks/replace to akonadi-server. Contains file migrated from
+    kdepimlibs-bin. 
+
  -- Clive Johnston <clivejo at aol.com>  Sat, 02 Jan 2016 13:29:44 +0000
 
 akonadi (4:15.08.2-0ubuntu3) xenial; urgency=medium
diff --git a/debian/control b/debian/control
index 94ffbde..5aa08f3 100644
--- a/debian/control
+++ b/debian/control
@@ -38,6 +38,8 @@ Architecture: any
 Depends: akonadi-backend-mysql (= ${source:Version}) | akonadi-backend-sqlite (= ${binary:Version}) | akonadi-backend-postgresql (= ${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}),
           akonadi-backend-sqlite (= ${binary:Version})

-- 
Akonadi packaging