[SCM] kompare packaging branch, kubuntu_vivid_archive, updated. debian/4.14.0-1-16-g0d07762

[Harald Sitter]

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

The following commit has been merged in the kubuntu_vivid_archive branch:
commit 0d0776248fda4447f8cfc473dbe294b98c44994f
Author: Harald Sitter <sitter at kde.org>
Date:   Mon Mar 2 11:37:42 2015 +0100

    kde frameworks 5 port
---
 debian/control         | 16 +++++++++++-----
 debian/kompare.install | 31 -------------------------------
 debian/rules           |  5 +----
 3 files changed, 12 insertions(+), 40 deletions(-)

diff --git a/debian/control b/debian/control
index 87f130c..3e5cb99 100644
--- a/debian/control
+++ b/debian/control
@@ -9,10 +9,18 @@ Uploaders: Sune Vuorela <sune at debian.org>,
            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
+               libkomparediff2-dev (>= 4:14.12.50)
 Standards-Version: 3.9.5
 Homepage: http://www.kde.org/
 Vcs-Browser: http://anonscm.debian.org/cgit/pkg-kde/kde-applications/kompare.git/
@@ -23,8 +31,6 @@ Architecture: any
 Section: devel
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Suggests: khelpcenter
-Replaces: libcvsservice0 (<<4:4.0.0)
-Breaks: libcvsservice0 (<<4:4.0.0)
 Description: file difference viewer
  Kompare displays the differences between files.  It can compare the
  contents of files or directories, as well as create, display, and merge patch
diff --git a/debian/kompare.install b/debian/kompare.install
deleted file mode 100644
index 233b85e..0000000
--- a/debian/kompare.install
+++ /dev/null
@@ -1,31 +0,0 @@
-usr/bin/kompare
-usr/lib/kde4/komparenavtreepart.so
-usr/lib/kde4/komparepart.so
-usr/lib/libkomparedialogpages.so.4
-usr/lib/libkomparedialogpages.so.4.*
-usr/lib/libkompareinterface.so.4
-usr/lib/libkompareinterface.so.4.*
-usr/share/applications/kde4/kompare.desktop
-usr/share/doc/kde/HTML/en/kompare/common
-usr/share/doc/kde/HTML/en/kompare/dock.png
-usr/share/doc/kde/HTML/en/kompare/index.cache.bz2
-usr/share/doc/kde/HTML/en/kompare/index.docbook
-usr/share/doc/kde/HTML/en/kompare/settings-diff1.png
-usr/share/doc/kde/HTML/en/kompare/settings-diff2.png
-usr/share/doc/kde/HTML/en/kompare/settings-diff3.png
-usr/share/doc/kde/HTML/en/kompare/settings-diff4.png
-usr/share/doc/kde/HTML/en/kompare/settings-view1.png
-usr/share/doc/kde/HTML/en/kompare/settings-view2.png
-usr/share/doc/kde/HTML/en/kompare/undock.png
-usr/share/icons/hicolor/128x128/apps/kompare.png
-usr/share/icons/hicolor/16x16/apps/kompare.png
-usr/share/icons/hicolor/22x22/apps/kompare.png
-usr/share/icons/hicolor/32x32/apps/kompare.png
-usr/share/icons/hicolor/48x48/apps/kompare.png
-usr/share/icons/hicolor/scalable/apps/kompare.svgz
-usr/share/kde4/apps/kompare/komparepartui.rc
-usr/share/kde4/apps/kompare/kompareui.rc
-usr/share/kde4/services/komparenavtreepart.desktop
-usr/share/kde4/services/komparepart.desktop
-usr/share/kde4/servicetypes/komparenavigationpart.desktop
-usr/share/kde4/servicetypes/kompareviewpart.desktop
diff --git a/debian/rules b/debian/rules
index 244905c..b57f3e9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,3 @@
 #!/usr/bin/make -f
 
-include /usr/share/pkg-kde-tools/qt-kde-team/2/debian-qt-kde.mk
-
-override_dh_auto_install:
-	$(overridden_command) --destdir=debian/tmp
+include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk

-- 
kompare packaging