[SCM] kompare packaging branch, kubuntu_unstable, updated. debian/4.14.0-1-18-g1b705ca

[Harald Sitter]

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

The following commit has been merged in the kubuntu_unstable branch:
commit 1b705cacf73e30168f08fe9bcf2cc4028151c214
Merge: 0d0776248fda4447f8cfc473dbe294b98c44994f 2caec93d5de2d5dac25d1af0f9ff1d6a955a0dce
Author: Harald Sitter <sitter at kde.org>
Date:   Tue Mar 10 11:22:44 2015 +0100

    Merge branch 'kubuntu_vivid_archive' into kubuntu_unstable
    
    Conflicts:
    	debian/control

 debian/changelog | 5 +++--
 debian/control   | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --cc debian/control
index 3e5cb99,beda7e3..bc9afc4
--- a/debian/control
+++ b/debian/control
@@@ -9,18 -9,10 +9,18 @@@ Uploaders: Sune Vuorela <sune at debian.or
             Maximiliano Curia <maxy at debian.org>
  Build-Depends: cmake,
                 debhelper (>= 9),
 -               kde-sc-dev-latest (>= 4:4.12),
 -               kdelibs5-dev (>= 4:4.14),
 +               extra-cmake-modules (>= 0.0.9),
 +               libkf5coreaddons-dev,
 +               libkf5codecs-dev,
 +               kdoctools-dev,
 +               libkf5iconthemes-dev,
 +               libkf5jobwidgets-dev,
 +               libkf5config-dev,
 +               libkf5parts-dev,
 +               libkf5texteditor-dev,
 +               libkf5widgetsaddons-dev,
                 pkg-kde-tools (>= 0.12),
-                libkomparediff2-dev (>= 4:14.12.50)
+                libkomparediff2-dev (>= 4:14.12.3)
  Standards-Version: 3.9.5
  Homepage: http://www.kde.org/
  Vcs-Browser: http://anonscm.debian.org/cgit/pkg-kde/kde-applications/kompare.git/

-- 
kompare packaging