[SCM] kio-extras packaging branch, kubuntu_stable, updated. 7ebfadf831c61eff04e100fef29aa6f55fb21a11

[Kubuntu CI (Harald Sitter)]

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

The following commit has been merged in the kubuntu_stable branch:
commit 7ebfadf831c61eff04e100fef29aa6f55fb21a11
Merge: 363a92e98ab5085e19a9598ee6a8382c38e3d612 d57fb9c553c247f04dc7d315abd2649198d33f83
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Mon Jun 29 18:15:03 2015 +0200

    merge master

 debian/.gitattributes          |   1 +
 debian/changelog               |  30 ++
 debian/control                 |  58 +--
 debian/copyright               | 885 +++++++++++++++--------------------------
 debian/kio-extras-data.install |   2 +-
 debian/kio-extras.install      |   5 +
 debian/rules                   |   7 +-
 debian/watch                   |   5 +-
 8 files changed, 391 insertions(+), 602 deletions(-)

diff --cc debian/changelog
index 8464fc1,cc6a6ea..221b842
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,22 -1,17 +1,36 @@@
 +kio-extras (4:5.3.2-0ubuntu1) UNRELEASED; urgency=medium
 +
 +  * New upstream release
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 29 Jun 2015 17:27:09 +0200
 +
 +kio-extras (4:5.3.1-0ubuntu1) wily; urgency=medium
 +
 +  * New upstream release
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Fri, 05 Jun 2015 02:30:32 +0200
 +
 +kio-extras (4:5.3.0-0ubuntu1) UNRELEASED; urgency=medium
 +
 +  * beta release
 +  * new upstream release
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Thu, 23 Apr 2015 17:00:21 +0200
 +
+ kio-extras (4:5.3.1-1~) UNRELEASED; urgency=medium
+ 
+   * New upstream release (5.3.0).
+   * New upstream release (5.3.1).
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Fri, 05 Jun 2015 11:55:49 +0200
+ 
+ kio-extras (4:5.2.2-1) experimental; urgency=medium
+ 
+   * New upstream release (5.2.1).
+   * New upstream release (5.2.2).
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Wed, 25 Mar 2015 23:17:41 +0100
+ 
  kio-extras (4:5.2.2-0ubuntu1) vivid; urgency=medium
  
    * New upstream release
diff --cc debian/kio-extras.install
index b2e34ea,7b4a6e9..d5438c0
--- a/debian/kio-extras.install
+++ b/debian/kio-extras.install
@@@ -1,2 -1,3 +1,7 @@@
++<<<<<<< HEAD
++=======
++>>>>>>> master
 +usr/lib/*/libmolletnetwork5.so.*
+ usr/lib/*/libmolletnetwork5.so.5
+ usr/lib/*/libmolletnetwork5.so.5.*
  usr/lib/*/qt5

-- 
kio-extras packaging