[SCM] qtwebchannel packaging branch, master, updated. 24ab1eac832b407aeeb9241eca881919001c3480

Sandro Knauß hefee-guest at moszumanska.debian.org
Thu Jul 28 15:11:10 UTC 2016


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

The following commit has been merged in the master branch:
commit 24ab1eac832b407aeeb9241eca881919001c3480
Author: Sandro Knauß <sknauss at kde.org>
Date:   Thu Jul 28 17:11:01 2016 +0200

    reorder copyright paragraphs
---
 debian/copyright | 42 ++++++++++++++++++++++++------------------
 1 file changed, 24 insertions(+), 18 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index aaa3c91..4f6aee6 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,24 +1,6 @@
 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Source: https://download.qt.io/official_releases/qt/*/submodules/
 
-Files: debian/*
-Copyright: 2016 Scarlett Clark <sgclark at kubuntu.org>
-           2016 Sandro Knauß <bugs at sandroknauss.de>
-           2016 Simon Quigley <tsimonq2 at ubuntu.com>
-License: LGPL-2+
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
- .
- This library 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
- Library General Public License for more details.
- .
- The complete text of the GNU Library General Public License version 2 can be
- found in `/usr/share/common-licenses/LGPL-2'.
-
 Files: *
 Copyright: 2014, Klarälvdalens Datakonsult AB, a KDAB Group company, info at kdab.com, author Milian Wolff <milian.wolff at kdab.com>
            2015, The Qt Company Ltd
@@ -26,6 +8,14 @@ Copyright: 2014, Klarälvdalens Datakonsult AB, a KDAB Group company, info at kdab.
            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-or-3 with Qt-1.1 exception
+
+Files: debian/*
+Copyright: 2016 Scarlett Clark <sgclark at kubuntu.org>
+           2016 Sandro Knauß <bugs at sandroknauss.de>
+           2016 Simon Quigley <tsimonq2 at ubuntu.com>
+License: LGPL-2+
+
+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
@@ -65,3 +55,19 @@ License: LGPL-2.1-or-3 with Qt-1.1 exception
  .
  Furthermore, you are not required to apply this additional permission to a
  modified version of the Library.
+
+License: LGPL-2+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
+ .
+ This library 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
+ Library General Public License for more details.
+ .
+ The complete text of the GNU Library General Public License version 2 can be
+ found in `/usr/share/common-licenses/LGPL-2'.
+
+

-- 
qtwebchannel packaging



More information about the pkg-kde-commits mailing list