[SCM] klettres packaging branch, kubuntu_vivid_archive, updated. debian/4.14.1-1-13-gc3b311a

[Harald Sitter]

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

The following commit has been merged in the kubuntu_vivid_archive branch:
commit 370182e37323cdc9c0ff137c37a86c9a94ed6188
Author: Harald Sitter <sitter at kde.org>
Date:   Mon Mar 2 13:29:55 2015 +0100

    kde frameworks 5 port
---
 debian/control               | 22 +++++++++++++++++-----
 debian/klettres-data.install | 18 ++++++------------
 debian/klettres.install      |  2 +-
 debian/rules                 |  2 +-
 4 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/debian/control b/debian/control
index 9f910c0..22263f8 100644
--- a/debian/control
+++ b/debian/control
@@ -7,14 +7,26 @@ Uploaders: Eshat Cakar <info at eshat.de>,
            Maximiliano Curia <maxy at debian.org>
 Build-Depends: cmake,
                debhelper (>= 9),
-               kde-sc-dev-latest (>= 4:4.11),
-               kdelibs5-dev,
-               pkg-kde-tools (>= 0.12)
+               extra-cmake-modules (>= 1.3.0),
+               kdoctools-dev,
+               libkf5completion-dev,
+               libkf5configwidgets-dev,
+               libkf5coreaddons-dev,
+               libkf5emoticons-dev,
+               libkf5i18n-dev,
+               libkf5itemmodels-dev,
+               libkf5kdelibs4support-dev,
+               libkf5newstuff-dev,
+               libkf5widgetsaddons-dev,
+               libphonon4qt5-dev,
+               libqt5svg5-dev (>= 5.2.0),
+               pkg-kde-tools (>= 0.12),
+               qtbase5-dev (>= 5.2.0)
 Standards-Version: 3.9.5
 XS-Testsuite: autopkgtest
 Homepage: http://edu.kde.org/
-Vcs-Browser: http://anonscm.debian.org/cgit/pkg-kde/kde-applications/klettres.git/
-Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-applications/klettres.git
+Vcs-Browser: http://anonscm.debian.org/cgit/pkg-kde/applications/klettres.git/
+Vcs-Git: git://anonscm.debian.org/pkg-kde/applications/klettres.git
 
 Package: klettres
 Architecture: any
diff --git a/debian/klettres-data.install b/debian/klettres-data.install
index 4700948..d35c0d4 100644
--- a/debian/klettres-data.install
+++ b/debian/klettres-data.install
@@ -1,12 +1,6 @@
-usr/share/appdata/klettres.appdata.xml
-usr/share/doc/kde/HTML/en/klettres/
-usr/share/icons/hicolor/128x128/apps/klettres.png
-usr/share/icons/hicolor/16x16/apps/klettres.png
-usr/share/icons/hicolor/22x22/apps/klettres.png
-usr/share/icons/hicolor/32x32/apps/klettres.png
-usr/share/icons/hicolor/48x48/apps/klettres.png
-usr/share/icons/hicolor/64x64/apps/klettres.png
-usr/share/icons/hicolor/scalable/apps/klettres.svgz
-usr/share/kde4/apps/klettres/
-usr/share/kde4/config.kcfg/klettres.kcfg
-usr/share/kde4/config/klettres.knsrc
+etc/xdg/*
+usr/share/config.kcfg/*
+usr/share/doc/*
+usr/share/icons/*
+usr/share/klettres/*
+usr/share/kxmlgui5/*
diff --git a/debian/klettres.install b/debian/klettres.install
index a0afd4c..61d206f 100644
--- a/debian/klettres.install
+++ b/debian/klettres.install
@@ -1,2 +1,2 @@
 usr/bin/klettres
-usr/share/applications/kde4/klettres.desktop
+usr/share/applications/org.kde.klettres.desktop
diff --git a/debian/rules b/debian/rules
index 6647e9c..a1760e8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,5 @@
 #!/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
 
 .PHONY: override_dh_auto_test

-- 
klettres packaging