[SCM] kio packaging branch, kubuntu_utopic_next, updated. f047a8d980998bd97d08e88670ac481787acd302

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_utopic_next branch:
commit f047a8d980998bd97d08e88670ac481787acd302
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Tue Oct 7 12:08:24 2014 +0100

    kio Breaks/replaces old kio-extras for moved kio-trash
---
 debian/changelog | 4 ++--
 debian/control   | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 88f8702..ffc65db 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
 kio (5.3.0-0ubuntu1) utopic; urgency=medium
 
   [ Jonathan Riddell ]
-  * New upstream snapshot, required by Plasma 5.1
   * New upstream release
+  * kio Breaks/replaces old kio-extras for moved kio-trash
 
   [ Scarlett Clark ]
-  * Uncomment files triggered by list-missing to install file. 
+  * Uncomment files triggered by list-missing to install file.
   * Add new files triggered by list-missing to install file
 
  -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 07 Oct 2014 11:14:47 +0100
diff --git a/debian/control b/debian/control
index 0c7278f..04e09b6 100644
--- a/debian/control
+++ b/debian/control
@@ -77,6 +77,8 @@ Description: Resource and network access abstraction.
 Package: kio
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
+Breaks: kio-extras (<< 4:5.0.95-0ubuntu1~ubuntu14.10~ppa6)
+Replaces: kio-extras-data (<< 4:5.0.95-0ubuntu1~ubuntu14.10~ppa6)
 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