[SCM] kio packaging branch, master, updated. 791b4782731ea7dc6491ff0ab675d1aae47fb723

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 3684b83de30e007c793230b8f2f67a4cda893ca1
Merge: 90e8f05a9bac0f204f4b8eb1a3bcecae2c43da42 081764e80c0437f01a967756f972804c31d5bd19
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Fri Apr 17 12:36:05 2015 +0200

    Merge commit '081764e80c0437f01a967756f972804c31d5bd19'
    
    Conflicts:
    	debian/control
    	debian/libkf5kiocore5.symbols
    	debian/patches/series

 debian/changelog                               | 18 ++++++++++++++++++
 debian/libkf5kiocore5.symbols                  |  4 ++--
 debian/patches/kubuntu_kdelibs4-docs-path.diff | 12 ++++++++++++
 debian/patches/series                          |  1 +
 4 files changed, 33 insertions(+), 2 deletions(-)

diff --cc debian/changelog
index 9f7f525,b5245e7..7dcd7f7
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,26 -1,21 +1,44 @@@
 +kio (5.9.0-1~) UNRELEASED; urgency=medium
 +
 +  * New upstream release (5.9.0).
 +
 + -- Maximiliano Curia <maxy at debian.org>  Thu, 16 Apr 2015 10:23:55 +0200
 +
+ kio (5.9.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Mon, 13 Apr 2015 22:28:24 +0200
+ 
 +kio (5.8.0-1) experimental; urgency=medium
 +
 +  * New upstream release (5.8.0).
 +  * Update symbols files.
 +  * New patch: wait_for_a_bit_longer
 +  * Update copyright information.
 +
 + -- Maximiliano Curia <maxy at debian.org>  Sun, 22 Mar 2015 11:38:41 +0100
 +
+ kio (5.8.0-0ubuntu2) vivid; urgency=medium
+ 
+   * Add kubuntu_kdelibs4-docs-path.diff to search in kdelibs4 path
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Thu, 02 Apr 2015 17:19:09 +0200
+ 
+ kio (5.8.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 17 Mar 2015 15:38:15 +0100
+ 
 +kio (5.7.0-1) experimental; urgency=medium
 +
 +  * New upstream release (5.7.0).
 +  * New patch: return_on_ACCESS_DENIED
 +  * New patch: report_error_removing_dirs
 +
 + -- Maximiliano Curia <maxy at debian.org>  Fri, 06 Mar 2015 22:57:43 +0100
 +
  kio (5.7.0-0ubuntu2) vivid; urgency=medium
  
    * Make sure autopkgtest pulls in own binary packages as Depends
diff --cc debian/patches/series
index 582dfbc,4729980..c20b47a
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,3 -1,1 +1,4 @@@
 +return_on_ACCESS_DENIED
 +report_error_removing_dirs
 +wait_for_a_bit_longer
+ kubuntu_kdelibs4-docs-path.diff

-- 
kio packaging