[SCM] qt3d packaging branch, experimental, updated. debian/5.7.1+dfsg-2-26-ga7b575a

[Dmitry Shachnev]

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

The following commit has been merged in the experimental branch:
commit a7b575a51dbfb10d29699aad235afaa2abbdcb0d
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Thu Jul 13 16:58:44 2017 +0300

    Re-enable Assimp packages, but build with bundled Assimp for now.
    
    This reverts commit be2b5ceface26bd188bc2f2e2138d68eb96088d2
    and partially commit c9d0280dee80f623eeeff569dc48e1e3947c6fb8.
---
 debian/changelog                       |  4 ++--
 debian/control                         | 16 +++++++++++++++-
 debian/qt3d-gltfsceneio-plugin.install |  1 +
 debian/rules                           |  2 +-
 4 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c729cc8..2312ba9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,13 +18,13 @@ qt3d-opensource-src (5.9.0+dfsg-1) UNRELEASED; urgency=medium
     - qt3d-scene2d-plugin
 
   [ Dmitry Shachnev ]
+  * Move qgltf executable to qt3d-gltfsceneio-plugin package.
   * Migrate to automatic dbgsym packages.
   * Update debian/copyright.
   * Update symbols files from the current amd64 build log.
   * Update the license for ConvertUTF code in debian/copyright according
     to upstream relicensing. Override the Lintian error about it.
-  * Temporarily build without Assimp support. We cannot use the bundled
-    library because of that ConvertUTF code, and we cannot use packaged
+  * Temporarily build with bundled Assimp. We cannot use the packaged
     Assimp because Qt 3D needs some changes which were added after v3.3.1.
   * Override false positive Lintian license-problem-json-evil error.
 
diff --git a/debian/control b/debian/control
index e21aa46..c24fb2f 100644
--- a/debian/control
+++ b/debian/control
@@ -189,12 +189,26 @@ Multi-Arch: same
 Depends: libqt53dcore5 (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
+Breaks: qt3d-assimpsceneio-plugin (<< 5.9.0+dfsg-1~)
+Replaces: qt3d-assimpsceneio-plugin (<< 5.9.0+dfsg-1~)
 Description: Qt 3D GL Transmission Format scene IO 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 GLTF geometry loader, scene import and
- export plugins.
+ 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
diff --git a/debian/qt3d-gltfsceneio-plugin.install b/debian/qt3d-gltfsceneio-plugin.install
index f58abaa..8ff8216 100644
--- a/debian/qt3d-gltfsceneio-plugin.install
+++ b/debian/qt3d-gltfsceneio-plugin.install
@@ -1,3 +1,4 @@
+usr/lib/*/qt5/bin/qgltf
 usr/lib/*/qt5/plugins/geometryloaders/libgltfgeometryloader.so
 usr/lib/*/qt5/plugins/sceneparsers/libgltfsceneexport.so
 usr/lib/*/qt5/plugins/sceneparsers/libgltfsceneimport.so
diff --git a/debian/rules b/debian/rules
index e37ae2c..91f2800 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_EXTRA_ARGS="-disable-assimp"
+	qmake QT_BUILD_PARTS+=tests
 
 override_dh_auto_build-indep:
 	dh_auto_build -- docs

-- 
qt3d packaging