[Forensics-changes] [guymager] 04/09: Switch from Qt4 to Qt5

[Michael Prokop]

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

mika pushed a commit to branch master
in repository guymager.

commit 357adc4c7d6812ff73a70cbc40e78295aaa127d0
Author: Michael Prokop <mika at debian.org>
Date:   Fri Jan 5 11:02:00 2018 +0100

    Switch from Qt4 to Qt5
    
    Closes: #874902
---
 debian/control | 3 ++-
 debian/rules   | 8 ++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/debian/control b/debian/control
index 8a519f6..25bc04b 100644
--- a/debian/control
+++ b/debian/control
@@ -11,9 +11,10 @@ Build-Depends:
  libguytools2-dev,
  libparted-dev,
  libprocps-dev,
- libqt4-dev,
  libssl-dev,
  libudev-dev,
+ qtbase5-dev,
+ qttools5-dev-tools,
  quilt,
 Standards-Version: 4.0.1
 Homepage: http://guymager.sourceforge.net/
diff --git a/debian/rules b/debian/rules
index 732ade3..5b0e12c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,13 +10,13 @@
 override_dh_auto_configure:
 	dh_quilt_patch
 	dh_testdir
-	qmake-qt4 DEFINES+="SPLASH_DIR=\'\\\"/usr/share/guymager\\\"\' LANGUAGE_DIR=\'\\\"/usr/share/guymager\\\"\' LANGUAGE_DIR_QT=\'\\\"/usr/share/qt4/translations\\\"\'"
+	qmake -qt5 DEFINES+="SPLASH_DIR=\'\\\"/usr/share/guymager\\\"\' LANGUAGE_DIR=\'\\\"/usr/share/guymager\\\"\' LANGUAGE_DIR_QT=\'\\\"/usr/share/qt5/translations\\\"\'"
 	touch configure-stamp
 
 override_dh_auto_build:
 	dh_testdir
 	$(MAKE)
-	lrelease guymager.pro
+	qtchooser -run-tool=lrelease -qt=qt5 guymager.pro
 	cd manuals  && ./rebuild.sh && cd -
 	touch $@
 
@@ -26,8 +26,8 @@ override_dh_auto_clean:
 	dh_testroot
 	rm -f build-stamp configure-stamp
 	# dpkg-buildpackage starts with cleaning, so we have to be sure that there's a
-	# Makefile (and thus call qmake-qt4):
-	qmake-qt4
+	# Makefile (and thus call qmake):
+	qmake -qt5
 	$(MAKE) clean
 	# remove leftover files:
 	rm -f guymager

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/forensics/guymager.git