[SCM] qtimageformats packaging branch, experimental, updated. debian/5.6.1-2-3-g7351370

Dmitry Shachnev mitya57 at moszumanska.debian.org
Mon Jul 11 20:43:08 UTC 2016 

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

The following commit has been merged in the experimental branch:
commit 7351370f4d28ac8b2a7cdd0a59e875fef8eee5cb
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Mon Jul 11 23:42:17 2016 +0300

    Update debian/copyright.
---
 debian/changelog |   1 +
 debian/copyright | 167 +++++++++++++++++++++++++++++++------------------------
 2 files changed, 95 insertions(+), 73 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 54dee11..ecf140d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ qtimageformats-opensource-src (5.7.0-1) UNRELEASED; urgency=medium
   [ Dmitry Shachnev ]
   * New upstream release.
   * Bump qtbase5-dev build-dependency to 5.7.0.
+  * Update debian/copyright.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 11 Jul 2016 23:40:57 +0300
 
diff --git a/debian/copyright b/debian/copyright
index aa26e51..0bb3476 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,8 +3,8 @@ Upstream-Name: qtimageformats-opensource-src
 Source: https://download.qt.io/official_releases/qt/*/submodules/
 
 Files: *
-Copyright: 2015 The Qt Company Ltd.
-License: LGPL-2.1-or-3 with Qt-1.1 exception
+Copyright: 2016 The Qt Company Ltd.
+License: LGPL-3 or GPL-2
 
 Files: debian/*
 Copyright: 2007-2012 Fathi Boudra <fabo at debian.org>
@@ -13,8 +13,8 @@ Copyright: 2007-2012 Fathi Boudra <fabo at debian.org>
            2007-2009 Ana Beatriz Guerrero Lopez <ana at debian.org>
            2005-2007 Brian Nelson <pyro at debian.org>
            2012-2013 Timo Jyrinki <timo.jyrinki at canonical.com>
-           2013-2014 Dmitry Shachnev <mitya57 at debian.org>
-License: LGPL-2.1
+           2013-2016 Dmitry Shachnev <mitya57 at debian.org>
+License: LGPL-3 or GPL-2
 
 Files: src/3rdparty/jasper/*
 Copyright: 2001-2006 Michael David Adams
@@ -23,7 +23,7 @@ Copyright: 2001-2006 Michael David Adams
 License: JasPer-License-Version-2.0
 
 Files: src/3rdparty/libmng/*
-Copyright: 2000-2004 Gerard Juyn <gerard at libmng.com>
+Copyright: 2000-2007 Gerard Juyn <gerard at libmng.com>
            2000 AM <s98t269 at stmail.eng.kagawa-u.ac.jp>
 License: BSD-3-clause
 
@@ -45,94 +45,115 @@ Copyright: 1992-1993 The Regents of the University of California.
 License: BSD-4-clause
 
 Files: src/3rdparty/libwebp/*
-Copyright: 2010 Google Inc.
+Copyright: 2010-2015 Google Inc.
 License: BSD-3-clause-Google
 
-Files: src/plugins/imageformats/icns/*
-       tests/auto/icns/tst_qicns.cpp
-Copyright: 2013 Alex Char
-           2015 The Qt Company Ltd.
-License: LGPL-2.1-or-3 with Qt-1.1 exception
-
 Files: src/plugins/imageformats/dds/*
-       tests/auto/dds/tst_qdds.cpp
-Copyright: 2013 Ivan Komissarov
-           2015 The Qt Company Ltd.
-License: LGPL-2.1-or-3 with Qt-1.1 exception
+Copyright: 2016 Ivan Komissarov
+           2016 The Qt Company Ltd.
+License: LGPL-3 or GPL-2
+
+Files: src/plugins/imageformats/icns/*
+Copyright: 2016 Alex Char
+           2016 The Qt Company Ltd.
+License: LGPL-3 or GPL-2
 
 Files: src/plugins/imageformats/jp2/*
-       tests/auto/jp2/tst_qjp2.cpp
-Copyright: 2014 Petroules Corporation
-           2015 The Qt Company Ltd.
-License: LGPL-2.1-or-3 with Qt-1.1 exception
+Copyright: 2016 Petroules Corporation
+           2016 The Qt Company Ltd.
+License: LGPL-3 or GPL-2
+
+Files: tests/*
+Copyright: 2016 The Qt Company Ltd.
+License: GPL-3 with Qt-1.0 exception
+
+Files: tests/auto/dds/tst_qdds.cpp
+Copyright: 2016 Ivan Komissarov
+           2016 The Qt Company Ltd.
+License: GPL-3 with Qt-1.0 exception
+
+Files: tests/auto/icns/tst_qicns.cpp
+Copyright: 2016 Alex Char
+           2016 The Qt Company Ltd.
+License: GPL-3 with Qt-1.0 exception
+
+Files: tests/auto/jp2/tst_qjp2.cpp
+Copyright: 2016 Petroules Corporation
+           2016 The Qt Company Ltd.
+License: GPL-3 with Qt-1.0 exception
 
 Files: *.qdoc
 Copyright: 2015 The Qt Company Ltd.
 License: GFDL-NIV-1.3
 
-License: LGPL-2.1-or-3 with Qt-1.1 exception
- GNU Lesser General Public License:
- This file may be used under the terms of the GNU Lesser General Public
- License version 2.1 or version 3 as published by the Free Software
- Foundation and appearing in the file LICENSE.LGPLv21 and LICENSE.LGPLv3
- included in the packaging of this file. Please review the following
- information to ensure the GNU Lesser General Public License requirements
- will be met: https://www.gnu.org/licenses/lgpl.html.
+License: LGPL-3
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Lesser General Public License version 3
+ as published by the Free Software Foundation.
  .
- In addition, as a special exception, The Qt Company gives you certain
- additional rights. These rights are described in The Qt Company Qt LGPL
- Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
- package.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU Lesser General Public License for more details.
  .
  On Debian systems, the complete text of the GNU Lesser General Public
- License version 2.1 can be found in `/usr/share/common-licenses/LGPL-2.1`.
- The complete text of the GNU Lesser General Public License version 3 can be
- found in `/usr/share/common-licenses/LGPL-3`.
- .
- The Qt Company LGPL Exception version 1.1:
- As an additional permission to the GNU Lesser General Public License version
- 2.1, the object code form of a "work that uses the Library" may incorporate
- material from a header file that is part of the Library.  You may distribute
- such object code under terms of your choice, provided that:
-     (i)   the header files of the Library have not been modified; and
-     (ii)  the incorporated material is limited to numerical parameters, data
-           structure layouts, accessors, macros, inline functions and
-           templates; and
-     (iii) you comply with the terms of Section 6 of the GNU Lesser General
-           Public License version 2.1.
+ License version 3 can be found in /usr/share/common-licenses/LGPL-3.
+
+License: GPL-2
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License version 2 as
+ published by the Free Software Foundation.
  .
- Moreover, you may apply this exception to a modified version of the Library,
- provided that such modification does not involve copying material from the
- Library into the modified Library's header files unless such material is
- limited to (i) numerical parameters; (ii) data structure layouts;
- (iii) accessors; and (iv) small macros, templates and inline functions of
- five lines or less in length.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
  .
- Furthermore, you are not required to apply this additional permission to a
- modified version of the Library.
+ On Debian systems, the complete text of the GNU General Public
+ License version 2 can be found in /usr/share/common-licenses/GPL-2.
 
-License: LGPL-2.1
- This file may be used under the terms of the GNU Lesser
- General Public License version 2.1 as published by the Free Software
- Foundation and appearing in the file LICENSE.LGPL included in the
- packaging of this file.  Please review the following information to
- ensure the GNU Lesser General Public License version 2.1 requirements
- will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+License: GPL-3 with Qt-1.0 exception
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License version 3 as
+ published by the Free Software Foundation.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ On Debian systems, the complete text of the GNU General Public License
+ version 3 can be found in /usr/share/common-licenses/GPL-3.
+ .
+ The Qt Company GPL Exception 1.0
+ Exception 1:
+ .
+ As a special exception you may create a larger work which contains the
+ output of this application and distribute that work under terms of your
+ choice, so long as the work is not otherwise derived from or based on
+ this application and so long as the work does not in itself generate
+ output that contains the output from this application in its original
+ or modified form.
+ .
+ Exception 2:
  .
- On Debian systems, the complete text of the LGPL-2.1 license can be found in
- `/usr/share/common-licenses/LGPL-2.1`,
+ As a special exception, you have permission to combine this application
+ with Plugins licensed under the terms of your choice, to produce an
+ executable, and to copy and distribute the resulting executable under
+ the terms of your choice. However, the executable must be accompanied
+ by a prominent notice offering all users of the executable the entire
+ source code to this application, excluding the source code of the
+ independent modules, but including any changes you have made to this
+ application, under the terms of this license.
 
 License: GFDL-NIV-1.3
- GNU Free Documentation License Usage
- Alternatively, this file may be used under the terms of the GNU Free
- Documentation License version 1.3 as published by the Free Software
- Foundation and appearing in the file included in the packaging of
- this file.  Please review the following information to ensure
- the GNU Free Documentation License version 1.3 requirements
- will be met: http://www.gnu.org/copyleft/fdl.html.
+ Permission is granted to copy, distribute and/or modify this document
+ under the terms of the GNU Free Documentation License, Version 1.3
+ or any later version published by the Free Software Foundation;
+ with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
  .
- On Debian systems, the complete text of the GFDL-1.3 license can be found in
- `/usr/share/common-licenses/GFDL-1.3`,
+ On Debian systems, the complete text of the GNU Free Documentation
+ License version 1.3 can be found in /usr/share/common-licenses/GFDL-1.3.
 
 License: BSD-3-clause
  You may use this file under the terms of the BSD license as follows:

-- 
qtimageformats packaging

More information about the pkg-kde-commits mailing list