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

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_vivid_archive branch:
commit afba09570d43d45c8ca8406c12f2e746e5873f72
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Fri Jan 16 11:52:51 2015 +0100

    Repleace/conflict kio-mtp
---
 debian/changelog | 6 ++++++
 debian/control   | 2 ++
 2 files changed, 8 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 081c25c..069cf57 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+kio-extras (4:5.1.95-0ubuntu2) vivid; urgency=medium
+
+  * Repleace/conflict kio-mtp
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Fri, 16 Jan 2015 11:52:31 +0100
+
 kio-extras (4:5.1.95-0ubuntu1) vivid; urgency=medium
 
   * New upstream beta release
diff --git a/debian/control b/debian/control
index fdfa3ff..b05fee1 100644
--- a/debian/control
+++ b/debian/control
@@ -56,6 +56,8 @@ Package: kio-extras-data
 Section: libs
 Architecture: all
 Depends: ${misc:Depends}, ${shlibs:Depends}
+Replaces: kio-mtp
+Conflicts: kio-mtp
 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