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

Tue Jul 30 12:50:04 UTC 2013

Date: Tuesday, July 30, 2013 @ 12:50:02
  Author: mitya57-guest
Revision: 25314

Update debian/copyright, thanks Paul Tagliamonte for comments.

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

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

--- packages/pyqt5/trunk/debian/changelog	2013-07-30 09:44:47 UTC (rev 25313)
+++ packages/pyqt5/trunk/debian/changelog	2013-07-30 12:50:02 UTC (rev 25314)
@@ -1,3 +1,9 @@
+pyqt5 (5.0-2) UNRELEASED; urgency=low
+
+  * Update debian/copyright, thanks Paul Tagliamonte for comments.
+
+ -- Dmitry Shachnev <mitya57 at gmail.com>  Tue, 30 Jul 2013 16:44:16 +0400
+
 pyqt5 (5.0-1) experimental; urgency=low
 
   [ Dmitry Shachnev ]

Modified: packages/pyqt5/trunk/debian/copyright
===================================================================
--- packages/pyqt5/trunk/debian/copyright	2013-07-30 09:44:47 UTC (rev 25313)
+++ packages/pyqt5/trunk/debian/copyright	2013-07-30 12:50:02 UTC (rev 25314)
@@ -7,30 +7,26 @@
 
 License:
 
-PyQt5 is released under the terms of the GNU General Public License.
+PyQt5 is released under the terms of the GNU General Public License v3.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 or version 3 of the
-  License.
+  it under the terms of the GNU General Public License version 3.0 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.
 
-  You should have received a copy of the GNU General Public License with
-  the Debian GNU/Linux distribution in file /usr/share/common-licenses/GPL-2;
-  if not, write to the Free Software Foundation, Inc., 51 Franklin St,
-  Fifth Floor, Boston, MA  02110-1301 USA
-
   On Debian systems, the complete text of the GNU General Public
   License, can be found in /usr/share/common-licenses/GPL.
 -------------------------------------------------------------------
 
 
-The files in pyuic/ are (c) 2005 Torsten Marek (shlomme at gmx.net) and
-double-licensted under the GPL and the BSD license.
+The files in pyuic/ are:
+(c) 2005 Torsten Marek (shlomme at gmx.net),
+(c) 2013 Riverbank Computing Limited,
+and double-licensted under the GPL v3 and the BSD license.
 
 Copyright (c) The Regents of the University of California.
 All rights reserved.
@@ -60,12 +56,11 @@
 SUCH DAMAGE.
 -------------------------------------------------------------------
 
-files in examples (except examples/designer/plugins, which are licensed under
-the same terms as the rest of the package) are licensed under the BSD license:
+Files in examples are licensed under the BSD license:
 
 #############################################################################
 ##
-## Copyright (C) 2010 Riverbank Computing Limited.
+## Copyright (C) 2013 Riverbank Computing Limited.
 ## Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ## All rights reserved.
 ##
@@ -103,31 +98,24 @@
 ##
 #############################################################################
 
+The exception are some files in examples/designer/plugins/python and
+examples/designer/plugins/widgets, which are licensed under GNU General
+Public license v2 or later:
 
-The files in elementtree/ are (c) 1999-2004 by Fredrik Lundh.
-By obtaining, using, and/or copying this software and/or its
-associated documentation, you agree that you have read, understood,
-and will comply with the following terms and conditions:
+  Copyright (C) 2006 David Boddie <david at boddie.org.uk>
+  Copyright (C) 2005-2006 Trolltech ASA. All rights reserved.
 
-Permission to use, copy, modify, and distribute this software and
-its associated documentation for any purpose and without fee is
-hereby granted, provided that the above copyright notice appears in
-all copies, and that both that copyright notice and this permission
-notice appear in supporting documentation, and that the name of
-Secret Labs AB or the author not be used in advertising or publicity
-pertaining to distribution of the software without specific, written
-prior permission.
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
 
-SECRET LABS AB AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD
-TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANT-
-ABILITY AND FITNESS.  IN NO EVENT SHALL SECRET LABS AB OR THE AUTHOR
-BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY
-DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
-ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
-OF THIS SOFTWARE.
---------------------------------------------------------------------
+  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.
 
+
 The files dbus/dbus.cpp and dbus/dbus.h are:
 
 // Copyright (c) 2012 Riverbank Computing Limited
@@ -148,6 +136,7 @@
 // along with this program; if not, write to the Free Software Foundation,
 // Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 
+
 Copyright and licensing for contrib/sandbox/sandbox.* are:
 Copyright (c) 2007-9 Mark Summerfield. All rights reserved.</font>
 


