[SCM] qtwebchannel packaging branch, master, updated. e336fe8df429fe73ef200152d9b6a84c45339540

[Sandro Knauß]

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

The following commit has been merged in the master branch:
commit bc12f8cc1f0fe095cb3f653f1db2fe8f64c34bc6
Author: Simon Quigley <tsimonq2 at ubuntu.com>
Date:   Thu Jul 28 05:10:07 2016 -0500

    Correct the copyright entry for * in debian/changelog
---
 debian/copyright | 30 +-----------------------------
 1 file changed, 1 insertion(+), 29 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index 56e12a7..b7877b2 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -24,32 +24,4 @@ Copyright: 2014, Klarälvdalens Datakonsult AB, a KDAB Group company, info at kdab.
            2014, basysKom GmbH, author Bernd Lamecker <bernd.lamecker at basyskom.com>
            2014, basysKom GmbH, author Lutz Schönemann <lutz.schoenemann at basyskom.com>
            2014, basysKom GmbH, author Sumedha Widyadharma <sumedha.widyadharma at basyskom.com>
-License: LGPL-2.1+3
- $QT_BEGIN_LICENSE:LGPL21$
- Commercial License Usage
- Licensees holding valid commercial Qt licenses may use this file in
- accordance with the commercial license agreement provided with the
- Software or, alternatively, in accordance with the terms contained in
- a written agreement between you and The Qt Company. For licensing terms
- and conditions see http://www.qt.io/terms-conditions. For further
- information use the contact form at http://www.qt.io/contact-us.
- .
- GNU Lesser General Public License Usage
- Alternatively, 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 and
- http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
- .
- As a special exception, The Qt Company gives you certain additional
- rights. These rights are described in The Qt Company LGPL Exception
- version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
- .
- $QT_END_LICENSE$
- .
- The complete text of the GNU Lesser General Public License version 2.1 can be
- found in `/usr/share/common-licenses/LGPL-2.1', likewise, the complete text
- of the GNU Lesser General Public License version 3 can be found in
- `/usr/share/common-licenses/LGPL-3'.
+License: LGPL-2.1-or-3 with Qt-1.1 exception

-- 
qtwebchannel packaging