[SCM] kompare packaging branch, kubuntu_wily_archive, updated. debian/4.14.0-1-33-g7bf0960

[Jonathan Riddell]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/kompare.git;a=commitdiff;h=7bf0960

The following commit has been merged in the kubuntu_wily_archive branch:
commit 7bf096039bd358f33412518bb06e08d591bdf077
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Sat Jun 6 01:44:24 2015 +0200

    New upstream release
---
 debian/changelog | 7 +++++--
 debian/control   | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1593237..27546ab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-kompare (4:15.04.1-0ubuntu1) UNRELEASED; urgency=medium
+kompare (4:15.04.2-0ubuntu1) UNRELEASED; urgency=medium
 
   [ Scarlett Clark ]
   * New upstream release
@@ -12,7 +12,10 @@ kompare (4:15.04.1-0ubuntu1) UNRELEASED; urgency=medium
   * New upstream release
   * Vivid backport
 
- -- Scarlett Clark <sgclark at kubuntu.org>  Wed, 27 May 2015 08:55:24 -0700
+  [ Jonathan Riddell ]
+  * New upstream release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Sat, 06 Jun 2015 01:44:24 +0200
 
 kompare (4:14.12.3-0ubuntu1) vivid; urgency=medium
 
diff --git a/debian/control b/debian/control
index 9354e9a..9e69c30 100644
--- a/debian/control
+++ b/debian/control
@@ -19,7 +19,7 @@ Build-Depends: cmake,
                libkf5parts-dev,
                libkf5texteditor-dev,
                libkf5widgetsaddons-dev,
-               libkomparediff2-dev (>= 4:15.04.1),
+               libkomparediff2-dev (>= 4:15.04.2),
                pkg-kde-tools (>= 0.12)
 Standards-Version: 3.9.5
 Homepage: http://www.kde.org/

-- 
kompare packaging