[pentobi] 01/05: Build with Qt5.

[Juhani Numminen]

This is an automated email from the git hooks/post-receive script.

jsonic-guest pushed a commit to branch master
in repository pentobi.

commit 0963008dbf859d8734130932b0bb6a1ef55938b5
Author: Juhani Numminen <juhaninumminen0 at gmail.com>
Date:   Sat Jul 4 14:59:50 2015 +0300

    Build with Qt5.
    
    - d/rules: Add Qt5 cmake flags.
    - d/control: Adjust Build-Deps.
    - d/pentobi-kde-thumbnailer.install: Adjust for new install locations.
---
 debian/changelog                       | 10 ++++++++++
 debian/control                         |  7 +++++--
 debian/pentobi-kde-thumbnailer.install |  4 ++--
 debian/rules                           |  4 +++-
 4 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 533b3ad..65e105e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+pentobi (10.0-1) UNRELEASED; urgency=medium
+
+  * New upstream release.
+  * Build with Qt5.
+    - d/rules: Add Qt5 cmake flags.
+    - d/control: Adjust Build-Deps.
+    - d/pentobi-kde-thumbnailer.install: Adjust for new install locations.
+
+ -- Juhani Numminen <juhaninumminen0 at gmail.com>  Sat, 04 Jul 2015 14:54:50 +0300
+
 pentobi (9.0-2) unstable; urgency=medium
 
   * Upload to unstable.
diff --git a/debian/control b/debian/control
index 0a226ce..16904d6 100644
--- a/debian/control
+++ b/debian/control
@@ -6,8 +6,11 @@ Uploaders: Dean Evans <dean at codemonkies.net>,
            Juhani Numminen <juhaninumminen0 at gmail.com>
 Build-Depends: cmake,
                debhelper (>= 9),
-               kdelibs5-dev,
-               libqt4-dev
+               extra-cmake-modules,
+               kio-dev,
+               libqt5svg5-dev,
+               qttools5-dev,
+               qttools5-dev-tools
 Standards-Version: 3.9.6
 Homepage: http://pentobi.sourceforge.net
 Vcs-Git: git://anonscm.debian.org/pkg-games/pentobi.git
diff --git a/debian/pentobi-kde-thumbnailer.install b/debian/pentobi-kde-thumbnailer.install
index d1556a2..86ef1fb 100644
--- a/debian/pentobi-kde-thumbnailer.install
+++ b/debian/pentobi-kde-thumbnailer.install
@@ -1,2 +1,2 @@
-usr/lib/kde4/pentobi-thumbnail.so
-usr/share/kde4/services/pentobi-thumbnail.desktop
+usr/lib/*/qt5/plugins/pentobi-thumbnail.so
+usr/share/kservices5/pentobi-thumbnail.desktop
diff --git a/debian/rules b/debian/rules
index afe08ea..9be1ae5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,6 +15,8 @@ override_dh_auto_configure:
 	dh_auto_configure -- \
 		-DCMAKE_INSTALL_BINDIR=/usr/games \
 		-DCMAKE_INSTALL_DATADIR=/usr/share/games \
+		-DUSE_QT5=ON \
+		-DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
 		-DPENTOBI_BUILD_KDE_THUMBNAILER=ON \
 		-DPENTOBI_BUILD_TESTS=ON
 
@@ -24,5 +26,5 @@ override_dh_install:
 override_dh_installchangelogs:
 	dh_installchangelogs NEWS
 
-# The KDE thumbnailer .so file is a plugin.
 override_dh_makeshlibs:
+	# dh_makeshlibs not needed, the KDE thumbnailer .so file is a plugin

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/pentobi.git