[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=6d8fb31

The following commit has been merged in the master branch:
commit 6d8fb311bb061b2bca8ff2f436d9929f7eab9646
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Tue Jun 13 13:21:12 2017 +0300

    Move qgltf executable to qt3d-gltfsceneio-plugin package.
    
    It looks like a better place for it.
---
 debian/changelog                             | 4 ++++
 debian/control                               | 2 ++
 debian/qt3d-assimpsceneimport-plugin.install | 1 -
 debian/qt3d-gltfsceneio-plugin.install       | 1 +
 4 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 36ca743..2f64da2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 qt3d-opensource-src (5.9.0-1) UNRELEASED; urgency=medium
 
+  [ Simon Quigley ]
   * New upstream release.
   * Add myself to Uploaders.
   * Add new upstream files to qt3d-gltfsceneio-plugin, making it contain
@@ -16,6 +17,9 @@ qt3d-opensource-src (5.9.0-1) UNRELEASED; urgency=medium
     - qt3d-defaultgeometryloader-plugin
     - qt3d-scene2d-plugin
 
+  [ Dmitry Shachnev ]
+  * Move qgltf executable to qt3d-gltfsceneio-plugin package.
+
  -- Simon Quigley <tsimonq2 at ubuntu.com>  Fri, 09 Jun 2017 23:52:28 -0500
 
 qt3d-opensource-src (5.7.1+dfsg-2) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index f9485f2..7f78cbb 100644
--- a/debian/control
+++ b/debian/control
@@ -189,6 +189,8 @@ Multi-Arch: same
 Depends: libqt53dcore5 (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
+Breaks: qt3d-assimpsceneio-plugin (<< 5.9.0-1~)
+Replaces: qt3d-assimpsceneio-plugin (<< 5.9.0-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.
diff --git a/debian/qt3d-assimpsceneimport-plugin.install b/debian/qt3d-assimpsceneimport-plugin.install
index 6daa887..39b36a8 100644
--- a/debian/qt3d-assimpsceneimport-plugin.install
+++ b/debian/qt3d-assimpsceneimport-plugin.install
@@ -1,2 +1 @@
-usr/lib/*/qt5/bin/qgltf
 usr/lib/*/qt5/plugins/sceneparsers/libassimpsceneimport.so
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

-- 
qt3d packaging