[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=43fe162

The following commit has been merged in the master branch:
commit 43fe162a0e4bc3e22220e5a089a6abce404c13c9
Merge: 0b170ae62bdad0a48a8c385d88a1076ce3d0b64e 142d4f33fdb2ebc43331bb5337cb83b6324f605d
Author: Harald Sitter <sitter at kde.org>
Date:   Tue May 3 12:11:36 2016 +0200

    Merging master into Neon/unstable

 debian/changelog         | 13 +++++++++++++
 debian/control           | 38 +++++++++++++-------------------------
 debian/rules             |  2 +-
 debian/tests/acc         |  7 +++++++
 debian/upstream/metadata |  7 +++++++
 debian/watch             |  1 -
 6 files changed, 41 insertions(+), 27 deletions(-)

diff --cc debian/changelog
index 9e96f77,5fd020e..323017d
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,25 -1,16 +1,38 @@@
 +kbookmarks (5.21.0-0neon) xenial; urgency=medium
 +
 +  * New release
 +
 + -- Neon CI <neon at kde.org>  Mon, 11 Apr 2016 09:21:39 +0000
 +
 +kbookmarks (5.20.0-0neon) wily; urgency=medium
 +
 +  * New release
 +
 + -- Neon CI <neon at kde.org>  Fri, 01 Apr 2016 11:04:53 +0000
 +
+ kbookmarks (5.19.0-1) experimental; urgency=medium
+ 
+   * New upstream release (5.19.0).
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Sat, 13 Feb 2016 15:16:07 +0100
+ 
+ kbookmarks (5.18.0-1) experimental; urgency=medium
+ 
+   * New upstream release (5.17.0).
+   * New upstream release (5.18.0).
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Wed, 27 Jan 2016 13:33:46 +0100
+ 
 +kbookmarks (5.18.0-0ubuntu1) UNRELEASED; urgency=medium
 +
 +  [ Scarlett Clark ]
 +  * New upstream release Xenial
 +
 +  [ Philip Muškovac ]
 +  * New upstream release
 +
 + -- Philip Muškovac <yofel at kubuntu.org>  Wed, 06 Jan 2016 14:56:23 +0100
 +
  kbookmarks (5.16.0-1) unstable; urgency=medium
  
    * New upstream release (5.16.0).
diff --cc debian/control
index 98ca5b1,e092302..a536d87
--- 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.18.0~),
-                libkf5codecs-dev (>= 5.18.0~),
-                libkf5config-dev (>= 5.18.0~),
-                libkf5configwidgets-dev (>= 5.18.0~),
-                libkf5coreaddons-dev (>= 5.18.0~),
-                libkf5iconthemes-dev (>= 5.18.0~),
-                libkf5widgetsaddons-dev (>= 5.18.0~),
+                extra-cmake-modules (>= 5.19.0~),
+                libkf5codecs-dev (>= 5.19.0~),
+                libkf5config-dev (>= 5.19.0~),
+                libkf5configwidgets-dev (>= 5.19.0~),
+                libkf5coreaddons-dev (>= 5.19.0~),
+                libkf5iconthemes-dev (>= 5.19.0~),
+                libkf5widgetsaddons-dev (>= 5.19.0~),
 -               libkf5windowsystem-dev (>= 5.7.0),
 +               libkf5windowsystem-dev (>= 5.18.0~),
-                libkf5xmlgui-dev (>= 5.18.0~),
+                libkf5xmlgui-dev (>= 5.19.0~),
                 pkg-kde-tools (>= 0.15.15ubuntu1~),
                 qtbase5-dev (>= 5.4),
                 qttools5-dev (>= 5.4),
diff --cc debian/rules
index 6959a35,101156b..cdb695a
--- a/debian/rules
+++ b/debian/rules
@@@ -4,7 -4,9 +4,7 @@@
  include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk
  
  override_dh_strip:
- 	$(overridden_command) --dbg-package=libkf5bookmarks5-dbg
+ 	$(overridden_command) --dbgsym-migration='libkf5bookmarks5-dbg (<= 5.19.0-1~~)'
  
  override_dh_auto_test:
 -	HOME=$$(mktemp -d) xvfb-run -a $(overridden_command)
 +	# Disable build time dh_auto_test

-- 
kbookmarks packaging