[SCM] kompare packaging branch, kubuntu_vivid_archive, updated. debian/4.14.0-1-15-g5d1f134

[Scarlett Clark]

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

The following commit has been merged in the kubuntu_vivid_archive branch:
commit 5d1f134fb32e2929cc1a3e4fb14d266e8fc76baf
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Fri Feb 20 11:20:26 2015 -0800

    Add back kdelibs parent version depend
---
 debian/changelog | 6 ++++++
 debian/control   | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 265891f..a7bf024 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+kompare (4:14.12.2-0ubuntu2) UNRELEASED; urgency=medium
+
+  * Add back kdelibs parent version depend 
+
+ -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 20 Feb 2015 11:19:59 -0800
+
 kompare (4:14.12.2-0ubuntu1) vivid; urgency=medium
 
   * New upstream release
diff --git a/debian/control b/debian/control
index a0d66cd..87f130c 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Uploaders: Sune Vuorela <sune at debian.org>,
 Build-Depends: cmake,
                debhelper (>= 9),
                kde-sc-dev-latest (>= 4:4.12),
-               kdelibs5-dev,
+               kdelibs5-dev (>= 4:4.14),
                pkg-kde-tools (>= 0.12),
                libkomparediff2-dev
 Standards-Version: 3.9.5

-- 
kompare packaging