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

The following commit has been merged in the master branch:
commit b519bd6ff86b4a7ac67bde97057d4d0a07ca620a
Merge: 8dfcdb519be6917efd3000212ae591aad285297d 030cb0a9f2e2998c85f6a21df7386ba6f615d2a1
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Fri Jul 10 11:19:38 2015 -0700

    Merge remote-tracking branch 'origin/kubuntu_unstable' into kubuntu_wily_archive
    
    Conflicts:
    	debian/changelog
    	debian/control

 debian/changelog | 16 ++++++++++++++--
 debian/control   | 24 ++++++++++++------------
 2 files changed, 26 insertions(+), 14 deletions(-)

diff --cc debian/changelog
index acc9c27,38cfa5a..27b5b35
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,17 +1,17 @@@
 -kbookmarks (5.11.0-0ubuntu1) UNRELEASED; urgency=medium
 +kbookmarks (5.12.0-0ubuntu1) UNRELEASED; urgency=medium
  
 -  * Vivid backport
 -  * clean up merge. 
 +  * New upstream release
++  * Fix merge, remove unused broken backport.
  
 - -- Scarlett Clark <sgclark at kubuntu.org>  Wed, 08 Jul 2015 08:05:47 -0700
 + -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 10 Jul 2015 07:57:16 -0700
  
+ kbookmarks (5.11.0-1) unstable; urgency=medium
+ 
+   [ Maximiliano Curia ]
+   * New upstream release (5.11.0).
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Sun, 28 Jun 2015 22:20:18 +0200
+ 
  kbookmarks (5.10.0-0ubuntu1) wily; urgency=medium
  
    [ Maximiliano Curia ]
diff --cc debian/control
index 5d68397,fdd537e..943acc5
--- a/debian/control
+++ b/debian/control
@@@ -5,15 -5,15 +5,15 @@@ Maintainer: Debian/Kubuntu Qt/KDE Maint
  Uploaders: Maximiliano Curia <maxy at debian.org>
  Build-Depends: cmake (>= 2.8.12),
                 debhelper (>= 9),
-                extra-cmake-modules (>= 5.10.0),
-                libkf5codecs-dev (>= 5.12.0),
-                libkf5config-dev (>= 5.12.0),
-                libkf5configwidgets-dev (>= 5.12.0),
-                libkf5coreaddons-dev (>= 5.12.0),
-                libkf5iconthemes-dev (>= 5.12.0),
-                libkf5widgetsaddons-dev (>= 5.12.0),
-                libkf5windowsystem-dev (>= 5.12.0),
-                libkf5xmlgui-dev (>= 5.12.0),
 -               extra-cmake-modules (>= 5.11.0~),
 -               libkf5codecs-dev (>= 5.11.0~),
 -               libkf5config-dev (>= 5.11.0~),
 -               libkf5configwidgets-dev (>= 5.11.0~),
 -               libkf5coreaddons-dev (>= 5.11.0~),
 -               libkf5iconthemes-dev (>= 5.11.0~),
 -               libkf5widgetsaddons-dev (>= 5.11.0~),
 -               libkf5windowsystem-dev (>= 5.7.0),
 -               libkf5xmlgui-dev (>= 5.11.0~),
++               extra-cmake-modules (>= 5.12.0~),
++               libkf5codecs-dev (>= 5.12.0~),
++               libkf5config-dev (>= 5.12.0~),
++               libkf5configwidgets-dev (>= 5.12.0~),
++               libkf5coreaddons-dev (>= 5.12.0~),
++               libkf5iconthemes-dev (>= 5.12.0~),
++               libkf5widgetsaddons-dev (>= 5.12.0~),
++               libkf5windowsystem-dev (>= 5.12.0~),
++               libkf5xmlgui-dev (>= 5.12.0~),
                 pkg-kde-tools (>= 0.15.15ubuntu1~),
                 qtbase5-dev (>= 5.4),
                 qttools5-dev (>= 5.4),
@@@ -30,9 -30,9 +30,9 @@@ Package: libkf5bookmarks-de
  Section: libdevel
  Architecture: any
  Depends: libkf5bookmarks5 (= ${binary:Version}),
-          libkf5configwidgets-dev (>= 5.12.0),
-          libkf5iconthemes-dev (>= 5.12.0),
-          libkf5xmlgui-dev (>= 5.12.0),
 -         libkf5configwidgets-dev (>= 5.11.0~),
 -         libkf5iconthemes-dev (>= 5.11.0~),
 -         libkf5xmlgui-dev (>= 5.11.0~),
++         libkf5configwidgets-dev (>= 5.12.0~),
++         libkf5iconthemes-dev (>= 5.12.0~),
++         libkf5xmlgui-dev (>= 5.12.0~),
           qtbase5-dev (>= 5.4),
           ${misc:Depends}
  Description: Qt library with support for bookmarks and the XBEL format.

-- 
kbookmarks packaging