[SCM] libkomparediff2 packaging branch, kubuntu_vivid_archive, updated. debian/4.14.2-1-16-g886d389

[Scarlett Clark]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/libkomparediff2.git;a=commitdiff;h=886d389

The following commit has been merged in the kubuntu_vivid_archive branch:
commit 886d3899865bad8f4715627643fabef556cb3d5e
Merge: 46dc61df0e3ecd29b62df21d572029381cf1178e f034132367dbd0cb285e3b8847dd8f450cfd469c
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Fri Mar 13 20:46:46 2015 -0700

    KDE Frameworks 5 port
    -- Harald Sitter <sitter at kde.org>  Mon, 02 Mar 2015 11:27:34 +0100

 debian/changelog                                   |  11 ++
 debian/control                                     |  21 ++-
 debian/libkomparediff2-4.install                   |   2 -
 debian/libkomparediff2-4.symbols                   | 183 --------------------
 ...libkomparediff2-4.acc => libkomparediff2-5.acc} |   0
 debian/libkomparediff2-5.install                   |   2 +
 debian/libkomparediff2-5.symbols                   | 187 +++++++++++++++++++++
 debian/libkomparediff2-dev.install                 |   4 +-
 debian/rules                                       |   2 +-
 9 files changed, 216 insertions(+), 196 deletions(-)

diff --cc debian/changelog
index 6739051,aa7077d..bd87767
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,14 +1,19 @@@
+ libkomparediff2 (4:14.12.50-0ubuntu1) UNRELEASED; urgency=medium
+ 
++  [ Harald Sitter ]
+   * KDE Frameworks 5 port
+ 
++  [ Scarlett Clark ]
++  * manual merge
++
+  -- Harald Sitter <sitter at kde.org>  Mon, 02 Mar 2015 11:27:34 +0100
+ 
 -libkomparediff2 (4:14.12.3-0ubuntu1) UNRELEASED; urgency=medium
 +libkomparediff2 (4:14.12.3-0ubuntu1) vivid; urgency=medium
 +
+ 
    * New upstream release.
  
 - -- Scarlett Clark <sgclark at kubuntu.org>  Wed, 11 Mar 2015 14:14:17 -0700
 + -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 13 Mar 2015 13:50:52 -0700
  
  libkomparediff2 (4:14.12.2-0ubuntu1) vivid; urgency=medium
  

-- 
libkomparediff2 packaging