[SCM] karchive packaging branch, master, updated. debian/5.37.0-2-99-gba9224a

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/karchive.git;a=commitdiff;h=462eb60

The following commit has been merged in the master branch:
commit 462eb6008cb8c9b700cdd470d53634fdc84e716f
Merge: 997697bb89b99cabbe042d7f56b3b9c18438aa25 9b1f3f6f4b60e37fa60f8fdb71d8e4c4bc47506c
Author: Harald Sitter <sitter at kde.org>
Date:   Tue May 3 11:45:26 2016 +0200

    Merging master into Neon/unstable
    
    # Conflicts:
    #	debian/control
    #	debian/libkf5archive5.symbols
    #	debian/rules

 debian/changelog              | 15 +++++++++++++++
 debian/control                | 25 +++----------------------
 debian/libkf5archive5.symbols |  2 +-
 debian/rules                  |  2 +-
 debian/tests/acc              |  7 +++++++
 debian/upstream/metadata      |  7 +++++++
 debian/watch                  |  1 -
 7 files changed, 34 insertions(+), 25 deletions(-)

diff --cc debian/changelog
index 9623dfc,a43e268..66c15ef
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,29 -1,18 +1,44 @@@
 +karchive (5.21.0-0neon) xenial; urgency=medium
 +
 +  * New release
 +
 + -- Neon CI <neon at kde.org>  Mon, 11 Apr 2016 09:21:43 +0000
 +
 +karchive (5.20.0-0neon) wily; urgency=medium
 +
 +  * New release
 +
 + -- Neon CI <neon at kde.org>  Fri, 01 Apr 2016 11:04:41 +0000
 +
+ karchive (5.19.0-1) experimental; urgency=medium
+ 
+   * New upstream release (5.19.0).
+   * Update symbols files from buildds logs (5.18.0-1).
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Sat, 13 Feb 2016 15:16:39 +0100
+ 
+ karchive (5.18.0-1) experimental; urgency=medium
+ 
+   * New upstream release (5.17.0).
+   * Update symbols files from buildds logs (5.16.0-1).
+   * New upstream release (5.18.0).
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Wed, 27 Jan 2016 13:34:38 +0100
+ 
 +karchive (5.18.0-0ubuntu1) UNRELEASED; urgency=medium
 +
 +  [ Scarlett Clark ]
 +  * Debian merge. No remaining changes. 
 +  * Fix debian merge. 
 +  * Disable tests, only to move forward with merges.
 +    This absolutely must be fixed before going to archive.
 +  * New upstream release Xenial
 +
 +  [ Philip Muškovac ]
 +  * New upstream release
 +
 + -- Philip Muškovac <yofel at kubuntu.org>  Wed, 06 Jan 2016 14:55:42 +0100
 +
  karchive (5.16.0-1) unstable; urgency=medium
  
    * New upstream release (5.16.0).
diff --cc debian/rules
index ba8029c,3ce494d..bedffbb
--- a/debian/rules
+++ b/debian/rules
@@@ -4,6 -4,4 +4,6 @@@
  include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk
  
  override_dh_strip:
- 	$(overridden_command) --dbg-package=libkf5archive5-dbg
+ 	$(overridden_command) --dbgsym-migration='libkf5archive5-dbg (<= 5.19.0-1~~)'
 +
 +.PHONY: override_dh_auto_test

-- 
karchive packaging