[SCM] ktouch packaging branch, master, updated. debian/16.08.3-1-55-g6943526

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit efb72243016a4abf20b6f92fba0ac80b63b71a82
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Thu Dec 15 23:17:26 2016 +0000

    kf5
---
 debian/control             | 33 +++++++++++++++++++++------------
 debian/ktouch-data.install | 19 +++++++++----------
 debian/ktouch.install      |  3 ++-
 debian/rules               |  6 +++---
 4 files changed, 35 insertions(+), 26 deletions(-)

diff --git a/debian/control b/debian/control
index a25a2c2..da3908c 100644
--- a/debian/control
+++ b/debian/control
@@ -5,11 +5,27 @@ Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Eshat Cakar <info at eshat.de>, Maximiliano Curia <maxy at debian.org>
 Build-Depends: cmake,
                debhelper (>= 9),
-               kde-sc-dev-latest (>= 4:4.12),
-               kdelibs5-dev (>= 4:4.14),
-               libqt4-opengl-dev,
+               extra-cmake-modules,
+               libkf5config-dev,
+               libkf5configwidgets-dev,
+               libkf5coreaddons-dev,
+               libkf5declarative-dev,
+               libkf5i18n-dev,
+               libkf5itemviews-dev,
+               libkf5kcmutils-dev,
+               libkf5kio-dev,
+               libkf5newstuff-dev,
+               libkf5texteditor-dev,
+               libkf5widgetsaddons-dev,
+               libkf5windowsystem-dev,
+               libkf5xmlgui-dev,
+               libqt5x11extras5-dev,
+               libxcb-xkb-dev,
                libxkbfile-dev,
-               pkg-kde-tools (>= 0.12)
+               pkg-kde-tools (>= 0.12),
+               qtbase5-dev,
+               qtdeclarative5-dev,
+               qtscript5-dev
 Standards-Version: 3.9.8
 Homepage: http://edu.kde.org/
 Vcs-Browser: https://anonscm.debian.org/git/pkg-kde/applications/ktouch.git
@@ -17,12 +33,7 @@ Vcs-Git: https://anonscm.debian.org/git/pkg-kde/applications/ktouch.git
 
 Package: ktouch
 Architecture: any
-Depends: ktouch-data (>= ${source:Version}),
-         libqt5sql5-mysql,
-         qml-module-org-kde-charts,
-         ${misc:Depends},
-         ${shlibs:Depends}
-Suggests: khelpcenter
+Depends: ktouch-data (>= ${source:Version}), ${misc:Depends}, ${shlibs:Depends}
 Description: touch typing tutor for KDE
  KTouch is an aid for learning how to type with speed and accuracy.  It
  provides a sample text to type and indicates which fingers should be used for
@@ -36,8 +47,6 @@ Description: touch typing tutor for KDE
 
 Package: ktouch-data
 Architecture: all
-Breaks: ktouch (<< 4:4.7.2)
-Replaces: ktouch (<< 4:4.7.2)
 Depends: ${misc:Depends}
 Description: data files for ktouch
  This package contains the architecture-independent data files for ktouch.
diff --git a/debian/ktouch-data.install b/debian/ktouch-data.install
index 2243eeb..f4f381b 100644
--- a/debian/ktouch-data.install
+++ b/debian/ktouch-data.install
@@ -1,11 +1,10 @@
-usr/share/appdata/ktouch.appdata.xml
-usr/share/doc/kde/HTML/en/ktouch/
-usr/share/icons/hicolor/128x128/apps/ktouch.png
-usr/share/icons/hicolor/16x16/apps/ktouch.png
-usr/share/icons/hicolor/22x22/apps/ktouch.png
-usr/share/icons/hicolor/32x32/apps/ktouch.png
-usr/share/icons/hicolor/48x48/apps/ktouch.png
-usr/share/icons/hicolor/scalable/apps/ktouch.svgz
-usr/share/kde4/apps/ktouch/
-usr/share/kde4/config.kcfg/ktouch.kcfg
+usr/share/config.kcfg/ktouch.kcfg
+usr/share/doc/HTML/en/ktouch/
+usr/share/icons/hicolor/
+usr/share/ktouch/courses/
+usr/share/ktouch/data.xml
+usr/share/ktouch/images/
+usr/share/ktouch/keyboardlayouts/
+usr/share/ktouch/qml/
+usr/share/ktouch/schemata/
 usr/share/man/man1/ktouch.1
diff --git a/debian/ktouch.install b/debian/ktouch.install
index 34cdfcb..45da390 100644
--- a/debian/ktouch.install
+++ b/debian/ktouch.install
@@ -1,2 +1,3 @@
 usr/bin/ktouch
-usr/share/applications/kde4/ktouch.desktop
+usr/share/applications/org.kde.ktouch.desktop
+usr/share/metainfo/org.kde.ktouch.appdata.xml
diff --git a/debian/rules b/debian/rules
index 6c36f6b..b887671 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,6 @@
 #!/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
 
-override_dh_auto_configure:
-	$(overridden_command) -- -DKDEEDU_KTOUCH_BUILD_WITH_PHONON=ON
+override_dh_auto_test:
+	:

-- 
ktouch packaging