[SCM] qt3d packaging branch, master, updated. debian/5.9.1+dfsg-1

[Lisandro Damián Nicanor Pérez]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qt3d.git;a=commitdiff;h=c9d0280

The following commit has been merged in the master branch:
commit c9d0280dee80f623eeeff569dc48e1e3947c6fb8
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Tue Jun 13 23:16:28 2017 +0300

    Temporarily build without Assimp support.
    
    We cannot use the bundled library because of non-DFSG ConvertUTF code, and
    we cannot use packaged Assimp because Qt 3D needs some changes which were
    added after v3.3.1 (see upstream commit 9621dff027734678).
---
 debian/changelog |  3 +++
 debian/control   | 13 -------------
 debian/rules     |  2 +-
 3 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d6725a6..83ec411 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,6 +23,9 @@ qt3d-opensource-src (5.9.0+dfsg-1) UNRELEASED; urgency=medium
   * Update debian/copyright.
   * Update symbols files from the current amd64 build log.
   * Remove non-free ConvertUTF code from the tarballs.
+  * Temporarily build without Assimp support. We cannot use the bundled
+    library because of that ConvertUTF code, and we cannot use packaged
+    Assimp because Qt 3D needs some changes which were added after v3.3.1.
 
  -- Simon Quigley <tsimonq2 at ubuntu.com>  Fri, 09 Jun 2017 23:52:28 -0500
 
diff --git a/debian/control b/debian/control
index f2fd98f..405623c 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,6 @@ Uploaders: Timo Jyrinki <timo at debian.org>,
            Dmitry Shachnev <mitya57 at debian.org>,
            Simon Quigley <tsimonq2 at ubuntu.com>
 Build-Depends: debhelper (>= 9.20160114~),
-               libassimp-dev,
                libgl1-mesa-dri <!nocheck>,
                libqt5opengl5-dev (>= 5.9.0+dfsg~),
                pkg-kde-tools,
@@ -198,18 +197,6 @@ Description: Qt 3D GL Transmission Format scene IO plugin
  This package contains Qt 3D's GLTF geometry loader, scene import and
  export plugins, and a helper qgltf executable.
 
-Package: qt3d-assimpsceneimport-plugin
-Architecture: any
-Multi-Arch: same
-Depends: libqt53dcore5 (= ${binary:Version}),
-         ${misc:Depends},
-         ${shlibs:Depends}
-Description: Qt 3D GL Assimp scene import plugin
- Qt is a cross-platform C++ application framework. Qt's primary feature
- is its rich set of widgets that provide standard GUI functionality.
- .
- This package contains Qt 3D's Assimp scene import plugin.
-
 Package: qt3d-defaultgeometryloader-plugin
 Architecture: any
 Multi-Arch: same
diff --git a/debian/rules b/debian/rules
index 91f2800..e37ae2c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,7 +15,7 @@ export LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) -Wl,--as-needed
 	dh $@ --fail-missing --parallel --with pkgkde_symbolshelper
 
 override_dh_auto_configure:
-	qmake QT_BUILD_PARTS+=tests
+	qmake QT_BUILD_PARTS+=tests QMAKE_EXTRA_ARGS="-disable-assimp"
 
 override_dh_auto_build-indep:
 	dh_auto_build -- docs

-- 
qt3d packaging