[vtk6] 10/12: d/control, d/rules: Move to qt5 also on armel, armhf

[Gert Wollny]

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

gert-guest pushed a commit to branch master
in repository vtk6.

commit e28b82bca388087dd551945157ce98138a6264fa
Author: Gert Wollny <gw.fossdev at gmail.com>
Date:   Sun Mar 27 13:14:48 2016 +0000

    d/control, d/rules: Move to qt5 also on armel, armhf
---
 debian/control | 10 ++++------
 debian/rules   |  7 +------
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/debian/control b/debian/control
index 0687a82..b4011d6 100644
--- a/debian/control
+++ b/debian/control
@@ -43,10 +43,8 @@ Build-Depends: chrpath,
                libpng-dev,
                libpq-dev,
                libproj-dev,
-               libqt4-dev [armel armhf],
-               libqt4-opengl-dev [armel armhf],
-               libqt5opengl5-dev [!armel !armhf],
-               libqt5webkit5-dev [!armel !armhf],
+               libqt5opengl5-dev,
+               libqt5webkit5-dev,
                libsqlite3-dev,
                libswscale-dev,
                libtheora-dev,
@@ -66,8 +64,8 @@ Build-Depends: chrpath,
                python-mpi4py,
                python-six,
                python-twisted,
-               qtbase5-dev [!armel !armhf],
-               qttools5-private-dev [!armel !armhf],
+               qtbase5-dev,
+               qttools5-private-dev,
                r-base,
                r-base-core,
                r-base-dev,
diff --git a/debian/rules b/debian/rules
index c0d28d6..af45359 100755
--- a/debian/rules
+++ b/debian/rules
@@ -49,12 +49,7 @@ extra_flags +=  \
 	-DVTK_USE_GCC_VISIBILITY=ON \
 	-DModule_vtkRenderingExternal=ON
 
-noqt_archs = armel armhf
-ifeq (,$(filter $(DEB_HOST_ARCH),$(noqt_archs)))
-	extra_flags += -DVTK_QT_VERSION=5	-DVTK_Group_Qt=ON
-else
-	extra_flags += -DVTK_QT_VERSION=4	-DVTK_Group_Qt=OFF  -DModule_vtkGUISupportQt=OFF -DModule_vtkGUISupportQtOpenGL=OFF -DModule_vtkGUISupportQtSQL=OFF
-endif
+extra_flags += -DVTK_QT_VERSION=5	-DVTK_Group_Qt=ON
 
 override_dh_auto_configure:
 ifneq (,$(filter $(DEB_HOST_ARCH),$(noqt_archs)))

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