[SCM] Akonadi packaging branch, akonadi4, updated. debian/1.13.0-8-5-ge32f042

[Maximiliano Curia]

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

The following commit has been merged in the akonadi4 branch:
commit e32f042739532a675455a5e3fdb07420650ac4a5
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Tue Jun 21 15:24:31 2016 +0200

    Add conflicts against libkf5akonadiserver-dev
    
    libakonadi-dev ship libkf5akonadiserver-dev:
     /usr/share/dbus-1/interfaces/org.freedesktop.Akonadi.Server.xml
     /usr/share/dbus-1/interfaces/org.freedesktop.Akonadi.StorageDebugger.xml
     /usr/share/dbus-1/interfaces/org.freedesktop.Akonadi.Agent.Control.xml
     /usr/share/dbus-1/interfaces/org.freedesktop.Akonadi.Agent.Search.xml
     /usr/share/dbus-1/interfaces/org.freedesktop.Akonadi.TracerNotification.xml
     /usr/share/dbus-1/interfaces/org.freedesktop.Akonadi.ControlManager.xml
     /usr/share/dbus-1/interfaces/org.freedesktop.Akonadi.Preprocessor.xml
     /usr/share/dbus-1/interfaces/org.freedesktop.Akonadi.Tracer.xml
     /usr/share/dbus-1/interfaces/org.freedesktop.Akonadi.AgentManager.xml
     /usr/share/dbus-1/interfaces/org.freedesktop.Akonadi.Resource.xml
     /usr/share/dbus-1/interfaces/org.freedesktop.Akonadi.Agent.Status.xml
     /usr/share/dbus-1/interfaces/org.freedesktop.Akonadi.NotificationSource.xml
     /usr/share/dbus-1/interfaces/org.freedesktop.Akonadi.NotificationManager.xml
     /usr/share/dbus-1/interfaces/org.freedesktop.Akonadi.DebugInterface.xml
---
 debian/control | 1 +
 1 file changed, 1 insertion(+)

diff --git a/debian/control b/debian/control
index 5d20152..ccc9b3b 100644
--- a/debian/control
+++ b/debian/control
@@ -43,6 +43,7 @@ Depends: libakonadiprotocolinternals1 (= ${binary:Version}),
          libboost-dev,
          libqt4-dev (>= 4:4.8.0),
          ${misc:Depends}
+Conflicts: libkf5akonadiserver-dev
 Suggests: pkg-config
 Description: development files for the Akonadi PIM storage service
  Akonadi is an extensible cross-desktop Personal Information Management (PIM)

-- 
Akonadi packaging