[SCM] cervisia packaging branch, master, updated. debian/16.08.2-1-61-g5411422

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 9c64349e4e276329706cb34a06601a23d93ad749
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Mon Jul 11 17:52:55 2016 +0100

    port to kf5
---
 debian/cervisia.install   | 36 +++++++++++-------------------------
 debian/control            | 13 ++++++++++---
 debian/cvsservice.install | 15 +++++++--------
 debian/not-installed      |  4 ----
 debian/rules              |  2 +-
 5 files changed, 29 insertions(+), 41 deletions(-)

diff --git a/debian/cervisia.install b/debian/cervisia.install
index 34078a3..5b6a00d 100644
--- a/debian/cervisia.install
+++ b/debian/cervisia.install
@@ -1,23 +1,11 @@
 usr/bin/cervisia
-usr/lib/kde4/cervisiapart.so
-usr/lib/libkdeinit4_cervisia.so
-usr/share/applications/kde4/cervisia.desktop
-usr/share/doc/kde/HTML/en/cervisia/annotate.png
-usr/share/doc/kde/HTML/en/cervisia/checkout.png
-usr/share/doc/kde/HTML/en/cervisia/commit.png
-usr/share/doc/kde/HTML/en/cervisia/common
-usr/share/doc/kde/HTML/en/cervisia/diff.png
-usr/share/doc/kde/HTML/en/cervisia/history.png
-usr/share/doc/kde/HTML/en/cervisia/import.png
-usr/share/doc/kde/HTML/en/cervisia/index.cache.bz2
-usr/share/doc/kde/HTML/en/cervisia/index.docbook
-usr/share/doc/kde/HTML/en/cervisia/logtree.png
-usr/share/doc/kde/HTML/en/cervisia/mainview.png
-usr/share/doc/kde/HTML/en/cervisia/patch.png
-usr/share/doc/kde/HTML/en/cervisia/popup.png
-usr/share/doc/kde/HTML/en/cervisia/repositories.png
-usr/share/doc/kde/HTML/en/cervisia/resolve.png
-usr/share/doc/kde/HTML/en/cervisia/updatetag.png
+usr/lib/x86_64-linux-gnu/libkdeinit5_cervisia.so
+usr/lib/x86_64-linux-gnu/libkdeinit5_cvsaskpass.so
+usr/lib/x86_64-linux-gnu/qt5/plugins/cervisiapart5.so
+usr/share/appdata/org.kde.cervisia.appdata.xml
+usr/share/applications/org.kde.cervisia5.desktop
+usr/share/config.kcfg/cervisiapart.kcfg
+usr/share/doc/HTML/en/cervisia/
 usr/share/icons/hicolor/16x16/actions/vcs-add-cvs-cervisia.png
 usr/share/icons/hicolor/16x16/actions/vcs-commit-cvs-cervisia.png
 usr/share/icons/hicolor/16x16/actions/vcs-diff-cvs-cervisia.png
@@ -52,10 +40,8 @@ usr/share/icons/hicolor/scalable/actions/vcs-diff-cvs-cervisia.svgz
 usr/share/icons/hicolor/scalable/actions/vcs-remove-cvs-cervisia.svgz
 usr/share/icons/hicolor/scalable/actions/vcs-status-cvs-cervisia.svgz
 usr/share/icons/hicolor/scalable/actions/vcs-update-cvs-cervisia.svgz
-usr/share/kde4/apps/appdata/cervisia.appdata.xml
-usr/share/kde4/apps/cervisia/cervisia.notifyrc
-usr/share/kde4/apps/cervisia/cervisiashellui.rc
-usr/share/kde4/apps/cervisiapart/cervisiaui.rc
-usr/share/kde4/config.kcfg/cervisiapart.kcfg
-usr/share/kde4/services/cervisiapart.desktop
+usr/share/kservices5/org.kde.cervisiapart5.desktop
+usr/share/kxmlgui5/cervisia/cervisia.notifyrc
+usr/share/kxmlgui5/cervisia/cervisiashellui.rc
+usr/share/kxmlgui5/cervisiapart/cervisiaui.rc
 usr/share/man/man1/cervisia.1
diff --git a/debian/control b/debian/control
index a963222..b171181 100644
--- a/debian/control
+++ b/debian/control
@@ -9,9 +9,16 @@ Uploaders: Sune Vuorela <sune at debian.org>,
            Maximiliano Curia <maxy at debian.org>
 Build-Depends: cmake (>= 2.6~),
                debhelper (>= 9),
-               kde-sc-dev-latest (>= 4:4.12),
-               kdelibs5-dev,
-               libsoprano-dev,
+               extra-cmake-modules,
+               kdoctools-dev,
+               kinit-dev,
+               libkf5config-dev,
+               libkf5iconthemes-dev,
+               libkf5itemviews-dev,
+               libkf5notifications-dev,
+               libkf5parts-dev,
+               libkf5su-dev,
+               libkf5widgetsaddons-dev,
                pkg-kde-tools (>= 0.12)
 Standards-Version: 3.9.8
 Homepage: http://www.kde.org/
diff --git a/debian/cvsservice.install b/debian/cvsservice.install
index 01b5a87..341f123 100644
--- a/debian/cvsservice.install
+++ b/debian/cvsservice.install
@@ -1,9 +1,8 @@
 usr/bin/cvsaskpass
-usr/bin/cvsservice
-usr/lib/libkdeinit4_cvsaskpass.so
-usr/lib/libkdeinit4_cvsservice.so
-usr/share/dbus-1/interfaces/org.kde.cervisia.cvsjob.xml
-usr/share/dbus-1/interfaces/org.kde.cervisia.cvsloginjob.xml
-usr/share/dbus-1/interfaces/org.kde.cervisia.cvsservice.xml
-usr/share/dbus-1/interfaces/org.kde.cervisia.repository.xml
-usr/share/kde4/services/cvsservice.desktop
+usr/bin/cvsservice5
+usr/lib/x86_64-linux-gnu/libkdeinit5_cvsservice.so
+usr/share/dbus-1/interfaces/org.kde.cervisia5.cvsjob.xml
+usr/share/dbus-1/interfaces/org.kde.cervisia5.cvsloginjob.xml
+usr/share/dbus-1/interfaces/org.kde.cervisia5.cvsservice.xml
+usr/share/dbus-1/interfaces/org.kde.cervisia5.repository.xml
+usr/share/kservices5/org.kde.cvsservice5.desktop
diff --git a/debian/not-installed b/debian/not-installed
index 8127958..76d0f15 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -1,6 +1,2 @@
-# Moved to private directory by dh_movelibkdeinit
-./usr/lib/libkdeinit4_cervisia.so
-./usr/lib/libkdeinit4_cvsaskpass.so
-./usr/lib/libkdeinit4_cvsservice.so
 #This is installed...
 ./usr/share/man/man1/cervisia.1
diff --git a/debian/rules b/debian/rules
index 6a77e53..b57f3e9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,3 +1,3 @@
 #!/usr/bin/make -f
 
-include /usr/share/pkg-kde-tools/qt-kde-team/2/debian-qt-kde.mk
+include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk

-- 
cervisia packaging