[SCM] kbookmarks packaging branch, kubuntu_unstable, updated. debian/5.9.0-1-3-g32ca8de

[Kubuntu CI (Harald Sitter)]

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

The following commit has been merged in the kubuntu_unstable branch:
commit 6dbcf720c281314102c325b95c55c2c418d7cc35
Merge: d76d889af344df2c0c0de612b350b8c34d5071b9 18a48c2e5652ed9d0651de20acfa7a1722b4362b
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Fri Mar 6 10:21:15 2015 +0100

    Merge remote-tracking branch 'origin/kubuntu_vivid_archive'
    
    Conflicts:
    	debian/control

 debian/changelog |  6 ++++++
 debian/control   | 18 +++++++++---------
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --cc debian/changelog
index a26adb1,24ab0e0..dd0cbed
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,22 -1,9 +1,28 @@@
 +kbookmarks (5.7.0-1~) UNRELEASED; urgency=medium
 +
 +  * New upstream release (5.7.0).
 +
 + -- Maximiliano Curia <maxy at debian.org>  Tue, 24 Feb 2015 17:41:17 +0100
 +
+ kbookmarks (5.7.0-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Harald Sitter <sitter at kde.org>  Tue, 10 Feb 2015 16:28:30 +0100
+ 
 +kbookmarks (5.6.0-1) experimental; urgency=medium
 +
 +  * Prepare initial Debian release.
 +  * Update build dependencies to build against experimental and to
 +    follow cmake.
 +  * Bump Standards-Version to 3.9.6, no changes needed.
 +  * Update copyright information.
 +  * Add basic autopkgtests support.
 +  * Update watch file.
 +  * Update install files.
 +
 + -- Maximiliano Curia <maxy at debian.org>  Thu, 29 Jan 2015 11:38:42 +0100
 +
  kbookmarks (5.6.0-0ubuntu1) vivid; urgency=medium
  
    * New upstream release
diff --cc debian/control
index 2aa9dc8,f3ddfa9..4b1a392
--- a/debian/control
+++ b/debian/control
@@@ -3,16 -3,31 +3,16 @@@ Section: lib
  Priority: optional
  Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
  Uploaders: Maximiliano Curia <maxy at debian.org>
 -Build-Depends: cmake,
 -               debhelper (>= 9.0.0),
 +Build-Depends: cmake (>= 2.8.12),
 +               debhelper (>= 9),
-                extra-cmake-modules (>= 1.6.0),
-                libkf5configwidgets-dev (>= 5.6.0),
-                libkf5coreaddons-dev (>= 5.6.0),
-                libkf5iconthemes-dev (>= 5.6.0),
-                libkf5windowsystem-dev (>= 5.6.0),
-                libkf5xmlgui-dev (>= 5.6.0),
+                extra-cmake-modules (>= 1.7.0),
 -               libkf5attica-dev (>= 5.7.0),
 -               libkf5auth-dev (>= 5.7.0),
 -               libkf5codecs-dev (>= 5.7.0),
 -               libkf5completion-dev (>= 5.7.0),
 -               libkf5config-dev (>= 5.7.0),
+                libkf5configwidgets-dev (>= 5.7.0),
+                libkf5coreaddons-dev (>= 5.7.0),
 -               libkf5dbusaddons-dev (>= 5.7.0),
 -               libkf5globalaccel-dev (>= 5.7.0),
 -               libkf5guiaddons-dev (>= 5.7.0),
 -               libkf5i18n-dev (>= 5.7.0),
+                libkf5iconthemes-dev (>= 5.7.0),
 -               libkf5itemviews-dev (>= 5.7.0),
 -               libkf5kjs-dev (>= 5.7.0),
 -               libkf5service-dev (>= 5.7.0),
 -               libkf5sonnet-dev (>= 5.7.0),
 -               libkf5textwidgets-dev (>= 5.7.0),
 -               libkf5widgetsaddons-dev (>= 5.7.0),
+                libkf5windowsystem-dev (>= 5.7.0),
+                libkf5xmlgui-dev (>= 5.7.0),
                 pkg-kde-tools (>= 0.15.15ubuntu1~),
 -               qtbase5-dev,
 +               qtbase5-dev (>= 5.2.0),
                 qttools5-dev,
                 qttools5-dev-tools,
                 xauth,
@@@ -27,10 -41,10 +27,10 @@@ Package: libkf5bookmarks-de
  Section: libdevel
  Architecture: any
  Depends: libkf5bookmarks5 (= ${binary:Version}),
-          libkf5configwidgets-dev (>= 5.6.0),
-          libkf5iconthemes-dev (>= 5.6.0),
-          libkf5xmlgui-dev (>= 5.6.0),
 -         libkf5configwidgets-dev,
 -         libkf5iconthemes-dev,
 -         libkf5xmlgui-dev,
 -         qtbase5-dev,
++         libkf5configwidgets-dev (>= 5.7.0),
++         libkf5iconthemes-dev (>= 5.7.0),
++         libkf5xmlgui-dev (>= 5.7.0),
 +         qtbase5-dev (>= 5.2.0),
           ${misc:Depends}
  Description: Qt library with support for bookmarks and the XBEL format.
   KBookmarks lets you access and manipulate bookmarks stored using the

-- 
kbookmarks packaging