[SCM] kajongg packaging branch, master, updated. debian/16.08.3-1-18-g3c1c3ed

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 9d5f3b0cb13c80e76a65101457caa8914ab3703d
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Mon Sep 4 18:21:49 2017 +0200

    Migrating to dh 10, python3, and kf5
    
    Gbp-Dch: Ignore
---
 debian/compat          |  2 +-
 debian/control         | 17 ++++-------------
 debian/kajongg.install | 17 -----------------
 debian/rules           | 19 ++++++++++---------
 4 files changed, 15 insertions(+), 40 deletions(-)

diff --git a/debian/compat b/debian/compat
index ec63514..f599e28 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/control b/debian/control
index 118dfb0..bd8c32a 100644
--- a/debian/control
+++ b/debian/control
@@ -10,15 +10,11 @@ Uploaders: Daniel Schepler <schepler at debian.org>,
            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,
-               libkdegames-dev,
-               libsqlite3-dev,
+               debhelper (>= 10),
                pkg-config,
                pkg-kde-tools (>= 0.14),
-               python (>= 2.6.6-3~),
-               python-twisted-core
+               dh-python,
+               python3,
 Standards-Version: 3.9.8
 Homepage: http://games.kde.org/
 Vcs-Browser: https://anonscm.debian.org/git/pkg-kde/applications/kajongg.git/
@@ -27,13 +23,8 @@ Vcs-Git: https://anonscm.debian.org/git/pkg-kde/applications/kajongg.git
 Package: kajongg
 Architecture: all
 Depends: kdegames-mahjongg-data (>= 4:4.10),
-         libqt4-sql-sqlite (>= 4.6),
-         python-kde4 (>= 4:4.3.0),
-         python-qt4-sql (>= 4.6),
-         python-twisted-core (>= 8.2.0),
-         vorbis-tools,
          ${misc:Depends},
-         ${python:Depends}
+         ${python3:Depends}
 Recommends: khelpcenter
 Description: classical Mah Jongg game
  This is the classical Mah Jongg for four players.
diff --git a/debian/kajongg.install b/debian/kajongg.install
deleted file mode 100644
index 4a77789..0000000
--- a/debian/kajongg.install
+++ /dev/null
@@ -1,17 +0,0 @@
-usr/games/kajongg
-usr/games/kajonggserver
-usr/share/appdata/kajongg.appdata.xml
-usr/share/applications/kde4/kajongg.desktop
-usr/share/doc/kde/HTML/en/kajongg/*
-usr/share/icons/hicolor/128x128/apps/kajongg.png
-usr/share/icons/hicolor/16x16/apps/kajongg.png
-usr/share/icons/hicolor/22x22/apps/kajongg.png
-usr/share/icons/hicolor/32x32/apps/kajongg.png
-usr/share/icons/hicolor/48x48/apps/kajongg.png
-usr/share/icons/hicolor/64x64/apps/kajongg.png
-usr/share/icons/hicolor/scalable/actions/games-kajongg-law.svgz
-usr/share/icons/hicolor/scalable/apps/kajongg.svgz
-usr/share/kde4/apps/kajongg/*.py
-usr/share/kde4/apps/kajongg/*.ui
-usr/share/kde4/apps/kajongg/kajonggui.rc
-usr/share/kde4/apps/kajongg/voices/*
diff --git a/debian/rules b/debian/rules
index fc3659c..c8db4d6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,15 +1,16 @@
 #!/usr/bin/make -f
 
-dh = --with=python2
+#override_dh_auto_install:
+#	$(overridden_command) --destdir=debian/tmp
 
-include /usr/share/pkg-kde-tools/qt-kde-team/2/debian-qt-kde.mk
+#override_dh_python3:
+#	dh_python3 -p kajongg /usr/share/kajongg
+#	dh_python3 -p kajongg /usr/share/kajonggserver
+#	dh_python3 --remaining-packages
 
-override_dh_auto_configure:
-	$(overridden_command) -- -DBIN_INSTALL_DIR=/usr/games -DINSTALL_KAJONGG=TRUE
 
-override_dh_auto_install:
-	$(overridden_command) --destdir=debian/tmp
+%:
+	dh $@ --with kf5 --buildsystem kf5 --with python3
 
-override_dh_python2:
-	$(overridden_command) -p kajongg /usr/share/kde4/apps/kajongg
-	$(overridden_command) -p kajongg /usr/share/kde4/apps/kajonggserver
+override_dh_auto_configure:
+	dh_auto_configure -- -DBIN_INSTALL_DIR=/usr/games

-- 
kajongg packaging