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

The following commit has been merged in the master branch:
commit c3d7ead6997f62d0b3947c91c86768b9421d5a99
Merge: 239595715721c7260592e698eb9623f94e4e61e6 8741813aac55ae229c54c7073bf0c5a218f09ee2
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Wed Dec 2 14:38:46 2015 -0800

    Fix debian merge.

 debian/changelog              | 1 +
 debian/libkf5archive5.symbols | 3 +--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --cc debian/changelog
index 23f8507,aece0aa..bb58d8e
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,3 +1,10 @@@
 +karchive (5.16.0-1ubuntu1) UNRELEASED; urgency=medium
 +
 +  * Debian merge. No remaining changes. 
++  * Fix debian merge. 
 +
 + -- Scarlett Clark <sgclark at kubuntu.org>  Wed, 02 Dec 2015 14:36:13 -0800
 +
  karchive (5.16.0-1) unstable; urgency=medium
  
    * New upstream release (5.16.0).

-- 
karchive packaging