[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=9838277

The following commit has been merged in the master branch:
commit 9838277adfae24d5683052c19e18a5f2e15f79c3
Merge: a12d5cea6cfb1ec07ccc5dc8682daae2346e05ed b0cf6402ba3a5b06ac8024d014d35c5c92b5c4cf
Author: Rohan Garg <rohan at garg.io>
Date:   Thu Jul 2 01:41:59 2015 +0200

    Merge branch 'master' into kubuntu_unstable
    
    Conflicts:
    	debian/changelog
    	debian/control

 debian/changelog | 11 ++++++++---
 debian/control   | 24 ++++++++++++------------
 2 files changed, 20 insertions(+), 15 deletions(-)

diff --cc debian/changelog
index 4e4b67c,67ca5dd..777a584
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,9 +1,17 @@@
- kbookmarks (5.10.0-0ubuntu1) wily; urgency=medium
+ kbookmarks (5.11.0-1) unstable; urgency=medium
  
 +  [ Maximiliano Curia ]
    * New upstream release (5.10.0).
+   * New upstream release (5.11.0).
+ 
 - -- Maximiliano Curia <maxy at debian.org>  Sun, 28 Jun 2015 22:20:18 +0200
++  -- Maximiliano Curia <maxy at debian.org>  Sun, 28 Jun 2015 22:20:18 +0200
++
++kbookmarks (5.10.0-0ubuntu1) wily; urgency=medium
 +
 +  [ Jonathan Riddell ]
 +  * New upstream release
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 03 Jun 2015 21:06:59 +0200
  
  kbookmarks (5.9.0-1) experimental; urgency=medium
  
@@@ -92,7 -89,7 +97,7 @@@ kbookmarks (5.2.0-0ubuntu1) utopic; urg
  kbookmarks (5.1.0-0ubuntu1) utopic; urgency=medium
  
    [ Scarlett Clark ]
--  * Update copyright to match licensing to source 
++  * Update copyright to match licensing to source
  
    [ José Manuel Santamaría Lema ]
    * Update libraries *.install paths so a soname bump doesn't go
@@@ -100,7 -97,7 +105,7 @@@
  
    [ Scarlett Clark ]
    * New upstream release
--  * Patch symbols with batchpatch 
++  * Patch symbols with batchpatch
  
   -- Scarlett Clark <scarlett at scarlettgatelyclark.com>  Tue, 05 Aug 2014 17:12:24 +0200
  

-- 
kbookmarks packaging