[SCM] kbookmarks packaging branch, master, updated. debian/5.37.0-2-88-gcf69a75

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 9e9da5bf5d75951386c636636958f130b1166975
Merge: 84bae1240a314b9655ae4ddcb39e602328727736 981ab3eaed4955d417a175e8f77c52ffc48e0ab4
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Fri Jul 24 15:35:53 2015 +0200

     Merge branch 'kubuntu_wily_archive' into kubuntu_unstable

 debian/changelog                |  5 +++++
 debian/libkf5bookmarks5.symbols | 34 +++++++++++++++++-----------------
 2 files changed, 22 insertions(+), 17 deletions(-)

diff --cc debian/changelog
index 28a3b22,703d7a2..527ad17
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,13 +1,14 @@@
  kbookmarks (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 07:57:16 -0700
  
  kbookmarks (5.11.0-1) unstable; urgency=medium

-- 
kbookmarks packaging