[SCM] gammaray packaging branch, master, updated. debian/2.3.0-3-61-g16a229e

[Jakub Adam]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/gammaray.git;a=commitdiff;h=16a229e

The following commit has been merged in the master branch:
commit 16a229eae29400cd89e4a8c39aac6e1739d4b110
Author: Jakub Adam <jakub.adam at tieto.com>
Date:   Wed Mar 1 08:59:21 2017 +0100

    Enable 3D widget inspector
---
 debian/changelog        |  1 +
 debian/control          | 11 ++++++++---
 debian/gammaray.install |  1 +
 debian/rules            |  2 +-
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index cd6ecaa..5b0f63d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ gammaray (2.7.0-1) UNRELEASED; urgency=medium
     - debian-archs-fix-build.patch
     - disable-qt4-objectvisualizer.patch.
   * Enable Wayland compositor inspector plugin.
+  * Enable 3D Widget inspector.
 
  -- Jakub Adam <jakub.adam at ktknet.cz>  Wed, 01 Mar 2017 08:18:38 +0100
 
diff --git a/debian/control b/debian/control
index 0e0393b..2e7e5f7 100644
--- a/debian/control
+++ b/debian/control
@@ -9,11 +9,15 @@ Build-Depends: debhelper (>= 9),
                qml-module-qtquick2,
                qtbase5-private-dev,
                qtconnectivity5-dev,
+               qtdeclarative5-dev-tools,
                qtpositioning5-dev,
                qtscript5-dev,
                qttools5-dev,
                qttools5-dev-tools,
                qttranslations5-l10n,
+               qt3d5-dev,
+               qt3d-assimpsceneio-plugin,
+               qt3d-gltfsceneio-plugin,
                libkf5coreaddons-dev,
                libqt5svg5-dev,
                libqt5waylandcompositor5-dev,
@@ -34,7 +38,10 @@ Homepage: http://www.kdab.com/gammaray
 Package: gammaray
 Architecture: any
 Pre-Depends: ${misc:Pre-Depends}
-Depends: ${shlibs:Depends},
+Depends: qml-module-qt3d,
+         qml-module-qtquick-controls,
+         qml-module-qtquick-scene3d,
+         ${shlibs:Depends},
          ${misc:Depends}
 Recommends: gammaray-probe-qt4,
             gdb
@@ -75,8 +82,6 @@ Description: QObject hierarchy visualization plugin for GammaRay
 Package: gammaray-plugin-quickinspector
 Architecture: any
 Depends: gammaray (= ${binary:Version}),
-         qml-module-qtquick2,
-         qml-module-qtquick-controls,
          ${shlibs:Depends},
          ${misc:Depends}
 Enhances: gammaray
diff --git a/debian/gammaray.install b/debian/gammaray.install
index 27c7940..f6edca0 100644
--- a/debian/gammaray.install
+++ b/debian/gammaray.install
@@ -3,6 +3,7 @@ usr/lib/libgammaray*qt5*.so.*
 usr/lib/libgammaray_client.so.*
 usr/lib/libgammaray_launcher.so.*
 usr/lib/gammaray/libexec
+usr/lib/gammaray/*/qt5*/gammaray_3dinspector*
 usr/lib/gammaray/*/qt5*/gammaray_actioninspector*
 usr/lib/gammaray/*/qt5*/gammaray_codecbrowser*
 usr/lib/gammaray/*/qt5*/gammaray_fontbrowser*
diff --git a/debian/rules b/debian/rules
index 2a7d8b5..e4a8f31 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,7 +20,7 @@ override_dh_auto_configure:
 	dh_auto_configure -B obj-qt4 -- $(CMAKE_FLAGS) -DGAMMARAY_ENFORCE_QT4_BUILD=ON -DGAMMARAY_PROBE_ONLY_BUILD=ON -DCMAKE_DISABLE_FIND_PACKAGE_VTK=True
 
 override_dh_auto_build:
-	dh_auto_build -B obj-qt5 -O--parallel
+	QT_SELECT=5 dh_auto_build -B obj-qt5 -O--parallel
 	dh_auto_build -B obj-qt4 -O--parallel
 
 override_dh_auto_test:

-- 
gammaray packaging