[med-svn] r17802 - trunk/packages/freemedforms-project/trunk/debian

[Eric Maeker]

Author: ericmaeker-guest
Date: 2014-08-19 15:30:44 +0000 (Tue, 19 Aug 2014)
New Revision: 17802

Modified:
   trunk/packages/freemedforms-project/trunk/debian/changelog
   trunk/packages/freemedforms-project/trunk/debian/control
   trunk/packages/freemedforms-project/trunk/debian/rules
Log:
freemedforms-project: better dual Qt integration

Modified: trunk/packages/freemedforms-project/trunk/debian/changelog
===================================================================
--- trunk/packages/freemedforms-project/trunk/debian/changelog	2014-08-19 15:07:14 UTC (rev 17801)
+++ trunk/packages/freemedforms-project/trunk/debian/changelog	2014-08-19 15:30:44 UTC (rev 17802)
@@ -2,9 +2,11 @@
 
   * Correcting user's documentation installation path
   * debian/control:
-     - Updating build dependencies to the new libquazip-dev (thanks to Emilio Pozuelo Monfort <pochu at debian.org>)
+    - Updating build dependencies to the new libquazip-dev
+  * debian/rules;debian/control
+    - Using qtchooser and QT_VERSION system var
 
- -- Eric Maeker <eric.maeker at gmail.com>  Sat, 09 Aug 2014 20:55:48 +0200
+ -- Eric Maeker <eric.maeker at gmail.com>  Sun, 17 Aug 2014 20:47:21 +0200
 
 freemedforms-project (0.9.0-2) unstable; urgency=low
 

Modified: trunk/packages/freemedforms-project/trunk/debian/control
===================================================================
--- trunk/packages/freemedforms-project/trunk/debian/control	2014-08-19 15:07:14 UTC (rev 17801)
+++ trunk/packages/freemedforms-project/trunk/debian/control	2014-08-19 15:30:44 UTC (rev 17802)
@@ -7,6 +7,7 @@
 Priority: optional
 Build-Depends: debhelper (>= 9),
                libqt4-dev (>= 4:4.8.0),
+               qtchooser,
                libxext-dev,
                zlib1g-dev,
                libopencv-core-dev (>= 2.3),

Modified: trunk/packages/freemedforms-project/trunk/debian/rules
===================================================================
--- trunk/packages/freemedforms-project/trunk/debian/rules	2014-08-19 15:07:14 UTC (rev 17801)
+++ trunk/packages/freemedforms-project/trunk/debian/rules	2014-08-19 15:30:44 UTC (rev 17802)
@@ -5,6 +5,9 @@
 #--------------------------------------------------------------------
 # Comments on the updates:
 #--------------------------------------------------------------------
+# Updating from 0.9.0-2 to 0.9.0-4
+# Using qtchooser and QT_VERSION system var to force a specific Qt version build
+#
 # Updating from 0.8.2 to 0.9.0
 # The optional plugins and features can now be defined in the 
 #     buildspecs/optionalplugins.pri
@@ -30,7 +33,7 @@
 FREEDIAMS:=freediams
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
-QMAKE:=qmake-qt4
+QT_VERSION=qt4
 QMAKE_GLOBAL_CONFIG:="CONFIG+=LINUX_INTEGRATED" \
                      "CONFIG+=dontbuildquazip" \
                      LIBRARY_BASENAME="lib/$(DEB_HOST_MULTIARCH)"
@@ -47,14 +50,17 @@
 AUTOCONF_SUB = -r $(QMAKE_GLOBAL_CONFIG) $(QMAKE_IPATH) $(1).pro
 
 %:
-	dh $@ --parallel --buildsystem=qmake_qt4 # --dbg-package=freemedforms-project-dbg
+	dh $@ --parallel --buildsystem=qmake # --dbg-package=freemedforms-project-dbg
 
 override_dh_auto_configure:
+	QT_SELECT=$(QT_VERSION) \
 	lrelease global_resources/translations/*.ts
 
+	QT_SELECT=$(QT_VERSION) \
 	dh_auto_configure -D$(FREEMEDFORMS_EMR) -- $(call AUTOCONF_MAIN, $(FREEMEDFORMS_EMR)) $(extra_configure_opts)
 	cp $(QMAKE_COMPILING) build/$(FREEMEDFORMS_EMR).pri
 
+	QT_SELECT=$(QT_VERSION) \
 	dh_auto_configure -D$(FREEDIAMS) -- $(call AUTOCONF_SUB, $(FREEDIAMS)) $(extra_configure_opts)
 	cp $(QMAKE_COMPILING) build/$(FREEDIAMS).pri
 
@@ -66,21 +72,26 @@
 	rm -Rf bin
 	rm -Rf build
 	rm -f global_resources/translations/[a-ps-z]*.qm
+	QT_SELECT=$(QT_VERSION) \
 	dh_auto_clean
 	find . -name Makefile -delete
 
 override_dh_auto_build:
 	cp build/$(FREEMEDFORMS_EMR).pri $(QMAKE_COMPILING)
+	QT_SELECT=$(QT_VERSION) \
 	dh_auto_build -D$(FREEMEDFORMS_EMR)
 
 	cp build/$(FREEDIAMS).pri $(QMAKE_COMPILING)
+	QT_SELECT=$(QT_VERSION) \
 	dh_auto_build -D$(FREEDIAMS)
 
 override_dh_auto_install:
 	cp build/$(FREEMEDFORMS_EMR).pri $(QMAKE_COMPILING)
+	QT_SELECT=$(QT_VERSION) \
 	dh_auto_install -D$(FREEMEDFORMS_EMR)/$(FREEMEDFORMS_EMR)-src -Smakefile -- INSTALL_ROOT=$(CURDIR)/debian/tmp
 
 	cp build/$(FREEDIAMS).pri $(QMAKE_COMPILING)
+	QT_SELECT=$(QT_VERSION) \
 	dh_auto_install -D$(FREEDIAMS)/$(FREEDIAMS)-src -Smakefile -- INSTALL_ROOT=$(CURDIR)/debian/tmp
 
 	# Remove empty dirs