[SCM] kactivities packaging branch, master, updated. debian/5.13.0-1-5-g3e95a3e

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kactivities.git;a=commitdiff;h=7cec531

The following commit has been merged in the master branch:
commit 7cec531abf302ef373fb9732d869b6294a9a7b04
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Mon Sep 14 23:35:39 2015 +0200

    Replace Conflicts with Break/Replaces.
---
 debian/control | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index fba19c7..cdcbc56 100644
--- a/debian/control
+++ b/debian/control
@@ -47,7 +47,8 @@ Description: Library to organize the user work in separate activities.
 Package: kactivities
 Architecture: any
 Depends: libqt5sql5-sqlite, ${misc:Depends}, ${shlibs:Depends}
-Conflicts: libkactivities-bin
+Breaks: libkactivities-bin
+Replaces: libkactivities-bin
 Description: Runtime to organize the user work in separate activities.
  This library provides functionality for managing Activities.
 

-- 
kactivities packaging