[SCM] kio packaging branch, kubuntu_unstable, updated. debian/5.11.0-1-20-g3fef668

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_unstable branch:
commit 3fef66829e3dd8cd94ab0a1efe1047f94ab9bf9a
Merge: 7eb7af4f64226b10c19b89d31bece7e9a04d63c9 7d2e085a8d531fc1e6b4c1b225d7f58454243c24
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Fri Jul 24 15:33:33 2015 +0200

     Merge branch 'kubuntu_wily_archive' into kubuntu_unstable

 debian/changelog                     |  5 +++++
 debian/libkf5kiocore5.symbols        | 16 ++++++++--------
 debian/libkf5kiofilewidgets5.symbols |  8 ++++----
 debian/libkf5kiowidgets5.symbols     | 10 +++++-----
 4 files changed, 22 insertions(+), 17 deletions(-)

diff --cc debian/changelog
index 95eb788,e492797..369dd55
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,13 +1,14 @@@
  kio (5.12.0-0ubuntu1) UNRELEASED; urgency=medium
  
+   [ Scarlett Clark ]
    * New upstream release
    * Fix merge, remove unused broken backport.
 +  * Vivid backport. 
  
+   [ José Manuel Santamaría Lema ]
+   * Update symbols file: mark as optional the symbols gone after
+     building with GCC 5
+ 
   -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 10 Jul 2015 08:13:45 -0700
  
  kio (5.11.0-1) unstable; urgency=medium

-- 
kio packaging