[SCM] kross packaging branch, master, updated. debian/5.37.0-2-80-ge4fd914

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kross.git;a=commitdiff;h=38a6986

The following commit has been merged in the master branch:
commit 38a698616b4bff550879927545817e34334eea24
Merge: 527b51eb4ed4c49c8200c47b6ed9b40e1101a7cd ea6071a0d995e6e48ad9c7c4d5b5b154ad013cc0
Author: Harald Sitter <sitter at kde.org>
Date:   Tue May 3 12:52:52 2016 +0200

    Merging master into Neon/unstable

 debian/changelog         | 12 ++++++++++++
 debian/control           | 47 +++++++++++++++++------------------------------
 debian/rules             |  2 +-
 debian/tests/acc         |  7 +++++++
 debian/upstream/metadata |  7 +++++++
 debian/watch             |  1 -
 6 files changed, 44 insertions(+), 32 deletions(-)

diff --cc debian/changelog
index 9ff7421,0ab3033..dd159c9
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,25 -1,15 +1,37 @@@
 +kross (5.21.0-0neon) xenial; urgency=medium
 +
 +  * New release
 +
 + -- Neon CI <neon at kde.org>  Mon, 11 Apr 2016 09:23:23 +0000
 +
 +kross (5.20.0-0neon) wily; urgency=medium
 +
 +  * New release
 +
 + -- Neon CI <neon at kde.org>  Fri, 01 Apr 2016 11:08:00 +0000
 +
+ kross (5.19.0-1) experimental; urgency=medium
+ 
+   * New upstream release (5.19.0).
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Sat, 13 Feb 2016 15:15:44 +0100
+ 
+ kross (5.18.0-1) experimental; urgency=medium
+ 
+   * New upstream release (5.18.0).
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Wed, 27 Jan 2016 13:33:12 +0100
+ 
 +kross (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 15:07:16 +0100
 +
  kross (5.16.0-1) unstable; urgency=medium
  
    * New upstream release (5.16.0).
diff --cc debian/control
index 7eb7ced,ffff47d..6d539be
--- a/debian/control
+++ b/debian/control
@@@ -5,17 -5,17 +5,17 @@@ 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~),
-                kdoctools-dev (>= 5.18.0~),
-                kio-dev (>= 5.18.0~),
-                libkf5completion-dev (>= 5.18.0~),
-                libkf5coreaddons-dev (>= 5.18.0~),
-                libkf5i18n-dev (>= 5.18.0~),
-                libkf5iconthemes-dev (>= 5.18.0~),
-                libkf5parts-dev (>= 5.18.0~),
+                extra-cmake-modules (>= 5.19.0~),
+                kdoctools-dev (>= 5.19.0~),
+                kio-dev (>= 5.19.0~),
+                libkf5completion-dev (>= 5.19.0~),
+                libkf5coreaddons-dev (>= 5.19.0~),
+                libkf5i18n-dev (>= 5.19.0~),
+                libkf5iconthemes-dev (>= 5.19.0~),
+                libkf5parts-dev (>= 5.19.0~),
 -               libkf5service-dev (>= 5.10.0~),
 +               libkf5service-dev (>= 5.18.0~),
-                libkf5widgetsaddons-dev (>= 5.18.0~),
-                libkf5xmlgui-dev (>= 5.18.0~),
+                libkf5widgetsaddons-dev (>= 5.19.0~),
+                libkf5xmlgui-dev (>= 5.19.0~),
                 pkg-kde-tools (>= 0.15.15ubuntu1~),
                 qtbase5-dev (>= 5.4),
                 qtscript5-dev (>= 5.4),
diff --cc debian/rules
index 8b07eb0,bfbfb70..7a7a0a4
--- a/debian/rules
+++ b/debian/rules
@@@ -4,8 -4,7 +4,8 @@@
  include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk
  
  override_dh_strip:
- 	$(overridden_command) --dbg-package=kross-dbg
+ 	$(overridden_command) --dbgsym-migration='kross-dbg (<= 5.19.0-1~~)'
  
  override_dh_auto_test:
 -	xvfb-run -a dh_auto_test
 +	# Disable dh_auto_test at build time
 +	:

-- 
kross packaging