[Forensics-changes] [libguytools] 05/08: Switch from Qt4 to Qt5

Michael Prokop mika at moszumanska.debian.org
Fri Jan 5 23:19:53 UTC 2018


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

mika pushed a commit to branch master
in repository libguytools.

commit cf738ee3f730035c39de69d73711593d5ac24677
Author: Michael Prokop <mika at debian.org>
Date:   Fri Jan 5 22:05:39 2018 +0100

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

diff --git a/debian/control b/debian/control
index 59f97dc..d28320b 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: libs
 Priority: optional
 Maintainer: Debian Forensics <forensics-devel at lists.alioth.debian.org>
 Uploaders: Michael Prokop <mika at debian.org>
-Build-depends: debhelper (>> 5.0.0), libqt4-dev
+Build-depends: debhelper (>> 5.0.0), qtbase5-dev, qttools5-dev-tools
 Standards-Version: 4.1.3
 Homepage: http://sourceforge.net/projects/libguytools/
 Vcs-git: git://anonscm.debian.org/forensics/libguytools.git
diff --git a/debian/rules b/debian/rules
index 9a44ccf..039eb9e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,8 +8,8 @@ build: build-stamp
 build-stamp:
 	dh_testdir
 	./create_version_file.sh
-	lrelease tools.pro
-	qmake-qt4 tools.pro
+	qtchooser -run-tool=lrelease -qt=qt5 tools.pro
+	qmake -qt5 tools.pro
 	$(MAKE)
 	touch build-stamp
 
@@ -18,12 +18,12 @@ clean:
 	dh_testroot
 	rm -f build-stamp
 	# dpkg-buildpackage starts with cleaning, so we have to be sure that there's a Makefile (and thus call qmake)
-	qmake-qt4 toolsstatic.pro
+	qmake -qt5 toolsstatic.pro
 	$(MAKE) clean
 	dh_clean
 
 	# remove leftover files:
-	rm -f Makefile libguytools_version.pro.inc lib/libguytools*
+	rm -f Makefile libguytools_version.pro.inc lib/libguytools* .qmake.stash
 	rmdir lib || true
 
 install: build

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



More information about the forensics-changes mailing list