[openmeca] 01/03: remove metapackage from build-depends

Damien André damien-andre-guest at moszumanska.debian.org
Sat Jan 28 17:13:35 UTC 2017


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

damien-andre-guest pushed a commit to branch master
in repository openmeca.

commit 4b5cf476f25db406f952c52addbe2e8a1958fb50
Author: Damien André <damien.andre at unilim.fr>
Date:   Sat Jan 28 17:43:57 2017 +0100

    remove metapackage from build-depends
---
 Makefile       | 9 +++++----
 debian/control | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index c06585a..89c81cc 100644
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,8 @@ endif
 BINDIR=bin
 
 # The qmake utility location (for unix-like systems)
-QMAKE=qmake -qt=5
+QMAKE=qtchooser -qt=5 -run-tool=qmake 
+
 
 
 
@@ -193,9 +194,9 @@ ifdef mxe
 	$(MAKE)
 else
 	@cd SRC/OpenMeca  ; \
-	lrelease ./OpenMeca.pro  ; \
-	qhelpgenerator ./Rsc/Help/Help.qhp -o ./Rsc/Help/Help.qch  ; \
-	qcollectiongenerator ./Rsc/Help/Help.qhcp -o ./Rsc/Help/Help.qhc ;\
+	qtchooser -qt=5 -run-tool=lrelease ./OpenMeca.pro  ; \
+	qtchooser -qt=5 -run-tool=qhelpgenerator ./Rsc/Help/Help.qhp -o ./Rsc/Help/Help.qch  ; \
+	qtchooser -qt=5 -run-tool=qcollectiongenerator ./Rsc/Help/Help.qhcp -o ./Rsc/Help/Help.qhc ;\
 	$(QMAKE)  ; \
 	$(MAKE)
 ifeq ($(OSName),Darwin)
diff --git a/debian/control b/debian/control
index f1bed81..2e83297 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 10),
                libqt5svg5-dev,
                libqt5opengl5-dev,
                qttools5-dev,
-	       qt5-default,
+	       qtchooser,
 	       libqt5sql5-sqlite
 Standards-Version: 3.9.8
 Vcs-Browser: https://anonscm.debian.org/cgit/debian-science/packages/openmeca.git

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/openmeca.git



More information about the debian-science-commits mailing list