[SCM] akonadi1 packaging branch, kubuntu_wily_archive, updated. 3964aa989ab6a45ab0757ae30b0136e3b05aca86

[Harald Sitter]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/krap/akonadi1.git;a=commitdiff;h=e3ab760

The following commit has been merged in the kubuntu_wily_archive branch:
commit e3ab760e622443d48808ce406b810420b3275e0a
Author: Harald Sitter <sitter at kde.org>
Date:   Wed Sep 2 14:36:01 2015 +0200

    libakonadi-dev conflicts libkf5akonadiserver-dev as they install the same dbus interfaces and thus must not be installed at the same time
---
 debian/changelog | 2 ++
 debian/control   | 1 +
 2 files changed, 3 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 62d10e6..1f3d25a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ akonadi1 (1.13.0-8ubuntu1) UNRELEASED; urgency=medium
     + Rip out all runtime packages (-server -backend-*) as we do not support
       actually running the akonadi1 server
     + Break&replace old packages
+    + libakonadi-dev conflicts libkf5akonadiserver-dev as they install the
+      same dbus interfaces and thus must not be installed at the same time
 
  -- Harald Sitter <sitter at kde.org>  Wed, 02 Sep 2015 09:57:37 +0200
 
diff --git a/debian/control b/debian/control
index b34c8ba..6ad73a2 100644
--- a/debian/control
+++ b/debian/control
@@ -45,6 +45,7 @@ Depends: libakonadiprotocolinternals1 (= ${binary:Version}),
          libqt4-dev (>= 4:4.8.0),
          ${misc:Depends}
 Suggests: pkg-config
+Conflicts: libkf5akonadiserver-dev
 Description: development files 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

-- 
akonadi1 packaging