[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=7ed575e

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

    Add assimp code back to the tarball, with updated license.
---
 debian/changelog                |  3 ++-
 debian/copyright                | 45 +++++++++++++++++++++++++++++++++++++++--
 debian/source/lintian-overrides |  5 +++++
 3 files changed, 50 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4634f50..c729cc8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,7 +21,8 @@ qt3d-opensource-src (5.9.0+dfsg-1) UNRELEASED; urgency=medium
   * Migrate to automatic dbgsym packages.
   * Update debian/copyright.
   * Update symbols files from the current amd64 build log.
-  * Remove non-free ConvertUTF code from the tarballs.
+  * 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
     Assimp because Qt 3D needs some changes which were added after v3.3.1.
diff --git a/debian/copyright b/debian/copyright
index 1af0b88..453e1d3 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,9 +2,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
-                src/3rdparty/assimp/contrib/ConvertUTF
 # audio-visualizer-qml: MP3 file under CC BY-ND 2.0
-# ConvertUTF: Unicode license that does not allow modification
 
 Files: *
 Copyright: 2013 Research In Motion
@@ -39,6 +37,16 @@ Files: src/3rdparty/assimp/contrib/clipper/*
 Copyright: 2010-2012 Angus Johnson
 License: Boost-1.0
 
+Files: src/3rdparty/assimp/contrib/ConvertUTF/*
+Copyright: 2001-2004 Unicode, Inc.
+License: unicode
+Note:
+ Unicode relicensed the code from a non-DFSG free to the current BSDish license.
+ Since then, the code has vanished from the unicode website (making the new
+ license somewhat hard to find).
+ See https://bugs.chromium.org/p/google-breakpad/issues/detail?id=270 for
+ details on why applying the (new, free) license is justified.
+
 Files: src/3rdparty/assimp/contrib/irrXML/*
 Copyright: 2002-2005 Nikolaus Gebhardt
 License: Zlib
@@ -680,3 +688,36 @@ License: Zlib
     misrepresented as being the original software.
  .
  3. This notice may not be removed or altered from any source distribution.
+
+License: unicode
+ Permission is hereby granted, free of charge, to any person obtaining
+ a copy of the Unicode data files and any associated documentation
+ (the "Data Files") or Unicode software and any associated documentation
+ (the "Software") to deal in the Data Files or Software
+ without restriction, including without limitation the rights to use,
+ copy, modify, merge, publish, distribute, and/or sell copies of
+ the Data Files or Software, and to permit persons to whom the Data Files
+ or Software are furnished to do so, provided that
+ (a) this copyright and permission notice appear with all copies
+ of the Data Files or Software,
+ (b) this copyright and permission notice appear in associated
+ documentation, and
+ (c) there is clear notice in each modified Data File or in the Software
+ as well as in the documentation associated with the Data File(s) or
+ Software that the data or software has been modified.
+ .
+ THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+ WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+ IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+ NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+ DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+ .
+ Except as contained in this notice, the name of a copyright holder
+ shall not be used in advertising or otherwise to promote the sale,
+ use or other dealings in these Data Files or Software without prior
+ written authorization of the copyright holder.
diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
index 11b9912..54a139c 100644
--- a/debian/source/lintian-overrides
+++ b/debian/source/lintian-overrides
@@ -1,3 +1,8 @@
 # False positive: files under JSON license are not actually present
 # (they would be at i.e. src/3rdparty/assimp/contrib/rapidjson/bin/jsonchecker/ if they were)
 qt3d-opensource-src source: license-problem-json-evil src/3rdparty/assimp/contrib/rapidjson/license.txt
+
+# convert-utf has been relicensed under a BSDish license (see d/copyright).
+# while assimp still includes the old code with the non-DFSG-free license,
+# the re-licensed code is the same
+qt3d-opensource-src source: license-problem-convert-utf-code src/3rdparty/assimp/contrib/ConvertUTF/ConvertUTF.c

-- 
qt3d packaging