[SCM] kio packaging branch, kubuntu_unstable, updated. 48522d98310cc42bce18a698d8c3d5fce3a28b13

[Harald Sitter]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kio.git;a=commitdiff;h=48522d9

The following commit has been merged in the kubuntu_unstable branch:
commit 48522d98310cc42bce18a698d8c3d5fce3a28b13
Author: Harald Sitter <sitter at kde.org>
Date:   Mon Oct 6 12:55:11 2014 +0200

    also need to conflict kio-extras-data
---
 debian/control | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index 6a244ec..f8db3d7 100644
--- a/debian/control
+++ b/debian/control
@@ -77,8 +77,10 @@ Description: Resource and network access abstraction.
 Package: kio
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Breaks: kio-extras (<< 4:5.0.95+git20141003.1250~)
-Replaces: kio-extras (<< 4:5.0.95+git20141003.1250~)
+Breaks: kio-extras (<< 4:5.0.95+git20141003.1250~),
+        kio-extras-data (<< 4:5.0.95+git20141003.1250~)
+Replaces: kio-extras (<< 4:5.0.95+git20141003.1250~),
+          kio-extras-data (<< 4:5.0.95+git20141003.1250~)
 Description: Resource and network access abstraction.
  KDE Input/Output framework provides a single API for
  operating on files, whether local or on a remote server.

-- 
kio packaging