[SCM] qtstyleplugins packaging branch, master, updated. debian/5.0.0-1-6-g07f5b61

Dmitry Shachnev mitya57 at moszumanska.debian.org
Sat Dec 10 13:59:31 UTC 2016


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

The following commit has been merged in the master branch:
commit 07f5b61bdf31a8cf60e143fd42be138a3420f0cb
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Sat Dec 10 16:55:13 2016 +0300

    Update debian/copyright.
---
 debian/changelog |  1 +
 debian/copyright | 69 +++++++++++++++++++++++++++++---------------------------
 2 files changed, 37 insertions(+), 33 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f89c532..5166420 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ qtstyleplugins-src (5.0.0+git16.g7aa4764-1) UNRELEASED; urgency=medium
     and platformtheme.
   * Update the package description to mention the GTK+ platform theme.
   * Break/Replace all versions of libqt5libqgtk2.
+  * Update debian/copyright.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 10 Dec 2016 15:34:18 +0300
 
diff --git a/debian/copyright b/debian/copyright
index a8746c7..25eb3cf 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,30 +2,31 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: qtstyleplugins-src
 
 Files: *
-Copyright: 2012 Digia Plc and/or its subsidiary(-ies)
-License: LGPL-2.1 with Digia Qt LGPL Exception 1.1 or GPL-3
+Copyright: 2012-2015 The Qt Company Ltd.
+License: LGPL-2.1 with Qt-1.1 exception or GPL-3
+
+Files: src/plugins/styles/bb10style/*
+Copyright: 2014 BlackBerry Limited.
+License: LGPL-2.1 with Qt-1.1 exception or GPL-3
 
 Files: debian/*
 Copyright: 2014 Pino Toscano <pino at debian.org>
 License: LGPL-2.1
 
-License: LGPL-2.1 with Digia Qt LGPL Exception 1.1
- GNU Lesser General Public License version 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: LGPL-2.1 with Qt-1.1 exception
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Lesser General Public License version 2.1
+ as published by the Free Software Foundation.
  .
- In addition, as a special exception, Digia gives you certain additional
- rights. These rights are described in the Digia 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
- can be found in `/usr/share/common-licenses/LGPL-2.1`.
+ 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.
  .
- Digia Qt LGPL Exception version 1.1:
+ 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
@@ -48,25 +49,27 @@ License: LGPL-2.1 with Digia Qt LGPL Exception 1.1
  modified version of the Library.
 
 License: GPL-3
- GNU General Public License Usage
+ 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.
  .
- Alternatively, this file may be used under the terms of the GNU
- General Public License version 3.0 as published by the Free Software
- Foundation and appearing in the file LICENSE.GPL included in the
- packaging of this file.  Please review the following information to
- ensure the GNU General Public License version 3.0 requirements will be
- met: http://www.gnu.org/copyleft/gpl.html.
+ 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 license can be found in
- `/usr/share/common-licenses/GPL-3`.
+ On Debian systems, the complete text of the GNU General Public License
+ version 3 can be found in /usr/share/common-licenses/GPL-3.
 
 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.
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Lesser General Public License version 2.1
+ 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 Lesser General Public License for more details.
  .
- On Debian systems, the complete text of the LGPL-2.1 license can be found in
- `/usr/share/common-licenses/LGPL-2.1`,
+ 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.

-- 
qtstyleplugins packaging



More information about the pkg-kde-commits mailing list