[SCM] kompare packaging branch, kubuntu_unstable, updated. debian/4.14.0-1-29-ga5dd084

[Kubuntu CI (Harald Sitter)]

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

The following commit has been merged in the kubuntu_unstable branch:
commit ed9914375f796919e9add5a5abdc62b1e50882e1
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Wed Apr 15 12:03:32 2015 -0700

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

diff --git a/debian/changelog b/debian/changelog
index 5604741..49ca2e6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+kompare (4:15.04.0-0ubuntu1) UNRELEASED; urgency=medium
+
+  * New upstream release
+
+ -- Scarlett Clark <sgclark at kubuntu.org>  Wed, 15 Apr 2015 12:03:32 -0700
+
 kompare (4:14.12.3-0ubuntu1) vivid; urgency=medium
 
   * Add back kdelibs parent version depend 
diff --git a/debian/control b/debian/control
index fc747fb..cb182e7 100644
--- a/debian/control
+++ b/debian/control
@@ -19,7 +19,7 @@ Build-Depends: cmake,
                libkf5parts-dev,
                libkf5texteditor-dev,
                libkf5widgetsaddons-dev,
-               libkomparediff2-dev (>= 4:14.12.3),
+               libkomparediff2-dev (>= 4:15.04.0),
                pkg-kde-tools (>= 0.12)
 Standards-Version: 3.9.5
 Homepage: http://www.kde.org/

-- 
kompare packaging