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

[Harald Sitter]

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

The following commit has been merged in the kubuntu_vivid_archive branch:
commit 1ea63a7b5ef5fd58d9eea8ed2f6cddf2b801bc88
Author: Harald Sitter <sitter at kde.org>
Date:   Wed Jan 28 16:30:35 2015 +0100

    Fix relationship with kio-mtp to support backports
---
 debian/changelog | 6 ++++++
 debian/control   | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3cf2ce8..97d152a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+kio-extras (4:5.2.0-0ubuntu2) UNRELEASED; urgency=medium
+
+  * Fix relationship with kio-mtp to support backports
+
+ -- Harald Sitter <sitter at kde.org>  Wed, 28 Jan 2015 16:30:15 +0100
+
 kio-extras (4:5.2.0-0ubuntu1) vivid; urgency=medium
 
   * New upstream release
diff --git a/debian/control b/debian/control
index e4aeb70..9f19da1 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-1ubuntu1)
-Breaks: kio-mtp (<< 0.75+git20140304-1ubuntu1)
+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