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

[Dmitry Shachnev]

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

The following commit has been merged in the experimental branch:
commit dcef0399eefc5dc625280f4a6bd36c158bd02b69
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Sat Jul 15 15:12:47 2017 +0300

    Remove some non-free example assets from the tarball.
    
    Document the license of assets/cubemaps/miramar/*.
---
 debian/changelog |  1 +
 debian/copyright | 11 +++++++++++
 2 files changed, 12 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 448bee6..61ee54f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -28,6 +28,7 @@ qt3d-opensource-src (5.9.1+dfsg-1) UNRELEASED; urgency=medium
     Assimp because Qt 3D needs some changes which were added after v3.3.1.
   * Override false positive Lintian license-problem-json-evil error.
   * Bump Qt build-dependencies to 5.9.1.
+  * Remove some non-free example assets from the tarball.
 
  -- Simon Quigley <tsimonq2 at ubuntu.com>  Fri, 09 Jun 2017 23:52:28 -0500
 
diff --git a/debian/copyright b/debian/copyright
index 453e1d3..0a111db 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,7 +2,13 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: qt3d-opensource-src
 Source: https://download.qt.io/official_releases/qt/*/submodules/
 Files-Excluded: examples/qt3d/audio-visualizer-qml
+                examples/qt3d/exampleresources/assets/chest
+                examples/qt3d/exampleresources/assets/houseplants
+                examples/qt3d/exampleresources/assets/metalbarrel
+                examples/qt3d/exampleresources/assets/textures/pattern_09
 # audio-visualizer-qml: MP3 file under CC BY-ND 2.0
+# assets/{chest,houseplants,metalbarrel}: Unknown copyright, see QTBUG-61415
+# assets/textures/pattern_09: Not freely redistributable, see QTBUG-61415
 
 Files: *
 Copyright: 2013 Research In Motion
@@ -130,6 +136,11 @@ Copyright:
   2015 Paul Lemire <paul.lemire350 at gmail.com>
 License: BSD-3-clause
 
+Files: examples/qt3d/exampleresources/assets/cubemaps/miramar/*
+Copyright: 2005 Jockum Skoglund <hipshot at zfight.com>
+License: miramar
+ Modify however you like, just cred me for my work, maybe link to my page.
+
 Files: examples/qt3d/exampleresources/assets/gltf/*
 Copyright: 2012 Motorola Mobility, Inc.
 License: BSD-3-clause

-- 
qt3d packaging