[SCM] kdeconnect-plasma packaging branch, kubuntu_vivid_archive, updated. 9afacba37965f0c8cc651aab59f0c866080e9812

[Jonathan Riddell]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kdeconnect-plasma.git;a=commitdiff;h=9afacba

The following commit has been merged in the kubuntu_vivid_archive branch:
commit 9afacba37965f0c8cc651aab59f0c866080e9812
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Sat Mar 7 01:30:37 2015 +0100

     change conflicts on kdeconnect for breaks/replaces << 0.7.3-0ubuntu2
    
    * change conflicts on kdeconnect for breaks/replaces << 0.7.3-0ubuntu2
    * recommend kdeconnect for kioslave and file action
---
 debian/changelog | 7 +++++++
 debian/control   | 5 +++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 24c013d..ef1e6f0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+kdeconnect-plasma (0.0+git20150302-0ubuntu2) vivid; urgency=medium
+
+  * change conflicts on kdeconnect for breaks/replaces << 0.7.3-0ubuntu2
+  * recommend kdeconnect for kioslave and file action
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Sat, 07 Mar 2015 01:20:31 +0100
+
 kdeconnect-plasma (0.0+git20150302-0ubuntu1) vivid; urgency=medium
 
   * Sync with Debian
diff --git a/debian/control b/debian/control
index 6eb54c7..947384c 100644
--- a/debian/control
+++ b/debian/control
@@ -28,8 +28,9 @@ Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-extras/kdeconnect-plasma.git
 Package: kdeconnect-plasma
 Architecture: any
 Depends: libqca-qt5-2-plugins, plasma-workspace, sshfs, ${misc:Depends}, ${shlibs:Depends}
-Conflicts: kdeconnect
-Replaces: kdeconnect
+Breaks: kdeconnect (<< 0.7.3-0ubuntu2)
+Replaces: kdeconnect (<< 0.7.3-0ubuntu2)
+Recommends: kdeconnect
 Description: connect smartphones to your KDE Plasma desktop
  Tool to integrate the KDE's Plasma desktop with your smartphones and
  similar devices.

-- 
kdeconnect-plasma packaging