[SCM] kio-extras packaging branch, kubuntu_vivid_archive, updated. 60e8c7062b665cd3737c255f136d316b9890667d

[Jonathan Riddell]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/kio-extras.git;a=commitdiff;h=60e8c70

The following commit has been merged in the kubuntu_vivid_archive branch:
commit 60e8c7062b665cd3737c255f136d316b9890667d
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Mon Jan 19 14:41:21 2015 +0100

    Break old version of kio-mtp
---
 debian/changelog | 6 ++++++
 debian/control   | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 069cf57..534a22c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+kio-extras (4:5.1.95-0ubuntu3) vivid; urgency=medium
+
+  * Break old version of kio-mtp
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 19 Jan 2015 14:41:08 +0100
+
 kio-extras (4:5.1.95-0ubuntu2) vivid; urgency=medium
 
   * Repleace/conflict kio-mtp
diff --git a/debian/control b/debian/control
index 6d51022..e4aeb70 100644
--- a/debian/control
+++ b/debian/control
@@ -56,8 +56,8 @@ Package: kio-extras-data
 Section: libs
 Architecture: all
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Replaces: kio-mtp (<= 0.75+git20140304-1)
-Conflicts: kio-mtp (<= 0.75+git20140304-1)
+Replaces: kio-mtp (<< 0.75+git20140304-1ubuntu1)
+Breaks: kio-mtp (<< 0.75+git20140304-1ubuntu1)
 Description: Extra functionality for kioslaves data files.
  A kioslave is a plugin designed to be intimately familiar with a certian
  protocol, so that a standardized interface can be used to get at data from

-- 
kio-extras packaging