[SCM] qt3d packaging branch, experimental, updated. debian/5.5.1-5-25-g8236426

[Dmitry Shachnev]

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

The following commit has been merged in the experimental branch:
commit 8236426799a7293caca92e073c6be1a6ca3e9ea0
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Wed Jun 15 18:36:34 2016 +0300

    Exclude audio-visualizer-qml example from the tarball.
    
    Because it contains a non-free MP3 file (CC BY-ND 2.0).
    
    Add qtmultimedia5-dev to Build-Conflicts to make sure that example is
    not built.
---
 debian/changelog | 6 +++++-
 debian/control   | 1 +
 debian/copyright | 1 +
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 090f21b..42c2a26 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-qt3d-opensource-src (5.6.1-1) UNRELEASED; urgency=medium
+qt3d-opensource-src (5.6.1+dfsg-1) UNRELEASED; urgency=medium
 
   [ Lisandro Damián Nicanor Pérez Meyer ]
   * New upstream release.
@@ -22,6 +22,10 @@ qt3d-opensource-src (5.6.1-1) UNRELEASED; urgency=medium
   [ Dmitry Shachnev ]
   * Add a patch to make the tests pass on big endian systems too.
     - Check the tests exit status on all architectures.
+  * Exclude audio-visualizer-qml example from the tarball because it contains
+    a non-free MP3 file (CC BY-ND 2.0).
+    - Add qtmultimedia5-dev to Build-Conflicts to make sure that example is
+      not built.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 31 Mar 2016 20:06:22 -0300
 
diff --git a/debian/control b/debian/control
index 00bfa89..4e3c056 100644
--- a/debian/control
+++ b/debian/control
@@ -21,6 +21,7 @@ Build-Depends-Indep: libqt5sql5-sqlite (>= 5.6.1+dfsg~),
                      qtbase5-doc-html (>= 5.6.1+dfsg~),
                      qtdeclarative5-doc-html (>= 5.6.1~),
                      qttools5-dev-tools (>= 5.6.1~)
+Build-Conflicts: qtmultimedia5-dev
 Standards-Version: 3.9.7
 Homepage: http://qt-project.org/
 Vcs-Git: https://anonscm.debian.org/git/pkg-kde/qt/qt3d.git
diff --git a/debian/copyright b/debian/copyright
index d6de4b1..2c8b9e0 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,6 +1,7 @@
 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
 
 Files: *
 Copyright: 2014 Klaralvdalens Datakonsult AB (KDAB)

-- 
qt3d packaging