[Python-modules-commits] r31440 - in packages/pyqt5/trunk/debian (changelog copyright)

[mitya57-guest at users.alioth.debian.org]

    Date: Thursday, November 13, 2014 @ 17:47:19
  Author: mitya57-guest
Revision: 31440

Add missing licensing information to debian/copyright.

Modified:
  packages/pyqt5/trunk/debian/changelog
  packages/pyqt5/trunk/debian/copyright

Modified: packages/pyqt5/trunk/debian/changelog
===================================================================
--- packages/pyqt5/trunk/debian/changelog	2014-11-13 13:06:49 UTC (rev 31439)
+++ packages/pyqt5/trunk/debian/changelog	2014-11-13 17:47:19 UTC (rev 31440)
@@ -1,6 +1,7 @@
 pyqt5 (5.3.2+dfsg-4) UNRELEASED; urgency=medium
 
   * Fix description of python-pyqt5.qtquick-dbg package.
+  * Add missing licensing information to debian/copyright.
 
  -- Dmitry Shachnev <mitya57 at debian.org>  Wed, 24 Sep 2014 15:01:19 +0400
 

Modified: packages/pyqt5/trunk/debian/copyright
===================================================================
--- packages/pyqt5/trunk/debian/copyright	2014-11-13 13:06:49 UTC (rev 31439)
+++ packages/pyqt5/trunk/debian/copyright	2014-11-13 17:47:19 UTC (rev 31440)
@@ -26,15 +26,29 @@
            2008,      Denviso GmbH
 License: GPL-2+
 
+Files: examples/draganddrop/delayedencoding/images/example.svg
+       examples/graphicsview/embeddeddialogs/embeddeddialogs.py
+       examples/ipc/*
+       examples/itemviews/spreadsheet/*
+       examples/network/lightmaps.py
+       examples/qtdemo/*
+       examples/quick/*
+       examples/richtext/textedit/textedit.py
+Copyright: 2010, Hans-Peter Jansen <hpj at urpla.net>
+           2010, Nokia Corporation and/or its subsidiary(-ies)
+           2013, Riverbank Computing Limited
+License: LGPL-2.1 with Digia-1.1 exception or GPL-3
+
 Files: pylupdate/*
 Copyright: 2002-2007, Detlev Offenbach <detlev at die-offenbachs.de>
            2013,      Digia Plc and/or its subsidiary(-ies)
-License: LGPL-2.1 or GPL-3
+           2014,      Riverbank Computing Limited
+License: LGPL-2.1 with Digia-1.1 exception or GPL-3
 
 Files: pyrcc/*
 Copyright: 2013, Digia Plc and/or its subsidiary(-ies)
            2014, Riverbank Computing Limited
-License: LGPL-2.1 or GPL-3
+License: LGPL-2.1 with Digia-1.1 exception or GPL-3
 
 Files: pyuic/*
 Copyright: 2005-2006, Thorsten Marek <shlomme at gmx.net>
@@ -73,7 +87,7 @@
  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
+License: LGPL-2.1 with Digia-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.
@@ -86,6 +100,27 @@
  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.
+ .
+ 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.
+ .
+ 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.
+ .
+ Furthermore, you are not required to apply this additional permission to a
+ modified version of the Library.
 
 License: BSD-3-clause
  Redistribution and use in source and binary forms, with or without