[Python-modules-commits] r29134 - in packages/sip4/trunk/debian (changelog copyright)

Wed May 28 13:05:25 UTC 2014

Date: Wednesday, May 28, 2014 @ 13:05:23
  Author: mitya57-guest
Revision: 29134

* Update debian/copyright to copyright-format 1.0.
* Add Files-Excluded field to remove HTML documentation, which
  contains sourceless minified jquery.

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

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

--- packages/sip4/trunk/debian/changelog	2014-05-28 12:15:59 UTC (rev 29133)
+++ packages/sip4/trunk/debian/changelog	2014-05-28 13:05:23 UTC (rev 29134)
@@ -2,6 +2,9 @@
 
   * New upstream release.
   * Bump API version to 11.1 (keep 11.0 in provided versions).
+  * Update debian/copyright to copyright-format 1.0.
+  * Add Files-Excluded field to remove HTML documentation, which
+    contains sourceless minified jquery.
 
  -- Dmitry Shachnev <mitya57 at gmail.com>  Wed, 28 May 2014 16:14:08 +0400
 

Modified: packages/sip4/trunk/debian/copyright
===================================================================
--- packages/sip4/trunk/debian/copyright	2014-05-28 12:15:59 UTC (rev 29133)
+++ packages/sip4/trunk/debian/copyright	2014-05-28 13:05:23 UTC (rev 29134)
@@ -1,121 +1,88 @@
-This package was debianized by Ricardo Javier Cardenes Medina <rcardenes at debian.org> on
-Tue, 10 Sep 2002 23:12:17 +0100
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Contact: pyqt at riverbankcomputing.com
+Files-Excluded: doc/html
 
-It was downloaded from http://www.riverbankcomputing.co.uk
+Files: *
+Copyright: 2014, Riverbank Computing Limited
+License:
+ This copy of SIP is licensed for use under the terms of the SIP License
+ Agreement.  See the file LICENSE for more details.
+ .
+ This copy of SIP may also used under the terms of the GNU General Public
+ License v2 or v3 as published by the Free Software Foundation.
+ .
+ On Debian systems, the complete text of the GNU General Public License
+ version 2 can be found in `/usr/share/common-licenses/GPL-2'.
+ The complete text of the GNU General Public License version 3 can be
+ found in `/usr/share/common-licenses/GPL-3'.
+ .
+ SIP is supplied WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-Upstream Author: Phil Thompson (phil at riverbankcomputing.co.uk)
-(c) 2011,2012,2013 Riverbank Computing Limited
+Files: sipdistutils.py
+Copyright: 2011, Develer Srl.
+License:
+ This copy of SIP is licensed for use under the terms of the SIP License
+ Agreement.  See the file LICENSE for more details.
+ .
+ This copy of SIP may also used under the terms of the GNU General Public
+ License v2 or v3 as published by the Free Software Foundation.
+ .
+ On Debian systems, the complete text of the GNU General Public License
+ version 2 can be found in `/usr/share/common-licenses/GPL-2'.
+ The complete text of the GNU General Public License version 3 can be
+ found in `/usr/share/common-licenses/GPL-3'.
+ .
+ SIP is supplied WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-sipdistuils.py: Copyright (c) 2011 Develer Srl.
+Files: sipgen/parser.h
+       sipgen/parser.c
+Copyright: 1984-2006, Free Software Foundation, Inc.
+License:
+ 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 (at your option)
+ any later version.
+ .
+ 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 GNU General Public License
+ version 2 can be found in `/usr/share/common-licenses/GPL-2'.
+ .
+ As a special exception, you may create a larger work that contains
+ part or all of the Bison parser skeleton and distribute that work
+ under terms of your choice, so long as that work isn't itself a
+ parser generator using the skeleton or a modified version thereof
+ as a parser skeleton.  Alternatively, if you modify or redistribute
+ the parser skeleton itself, you may (at your option) remove this
+ special exception, which will cause the skeleton and the resulting
+ Bison output files to be licensed under the GNU General Public
+ License without this special exception.
 
-SIP4 is offered under GPLv2, GPLv3, and the SIP 4 license. The text
-of the SIP license follows:
-
-RIVERBANK COMPUTING LIMITED LICENSE AGREEMENT FOR SIP 4.9
-
-1. This LICENSE AGREEMENT is between Riverbank Computing Limited
-("Riverbank"), and the Individual or Organization ("Licensee") accessing
-and otherwise using SIP 4.9 software in source or binary form and its
-associated documentation.  SIP 4.9 comprises a software tool for
-generating Python bindings for software C and C++ libraries, and a Python
-extension module used at runtime by those generated bindings.
-
-2. Subject to the terms and conditions of this License Agreement, Riverbank
-hereby grants Licensee a nonexclusive, royalty-free, world-wide license
-to reproduce, analyze, test, perform and/or display publicly, prepare
-derivative works, distribute, and otherwise use SIP 4.9 alone or in
-any derivative version, provided, however, that Riverbank's License
-Agreement and Riverbank's notice of copyright, e.g., "Copyright (c) 2009
-Riverbank Computing Limited; All Rights Reserved" are retained in
-SIP 4.9 alone or in any derivative version prepared by Licensee.
-
-3. In the event Licensee prepares a derivative work that is based on
-or incorporates SIP 4.9 or any part thereof, and wants to make
-the derivative work available to others as provided herein, then
-Licensee hereby agrees to include in any such work a brief summary of
-the changes made to SIP 4.9.
-
-4. Licensee may not use SIP 4.9 to generate Python bindings for any
-C or C++ library for which bindings are already provided by Riverbank.
-
-5. Riverbank is making SIP 4.9 available to Licensee on an "AS IS"
-basis.  RIVERBANK MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
-IMPLIED.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, RIVERBANK MAKES NO AND
-DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
-FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF SIP 4.9 WILL NOT
-INFRINGE ANY THIRD PARTY RIGHTS.
-
-6. RIVERBANK SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF
-SIP 4.9 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS
-AS A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING SIP 4.9,
-OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
-
-7. This License Agreement will automatically terminate upon a material
-breach of its terms and conditions.
-
-8. Nothing in this License Agreement shall be deemed to create any
-relationship of agency, partnership, or joint venture between Riverbank
-and Licensee.  This License Agreement does not grant permission to use
-Riverbank trademarks or trade name in a trademark sense to endorse or
-promote products or services of Licensee, or any third party.
-
-9. By copying, installing or otherwise using SIP 4.9, Licensee
-agrees to be bound by the terms and conditions of this License Agreement.
-
-****
-
-SIP is also licensed under the GPLv2 and GPLv3:
-
-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 version 2 or 3 of the License.
-
-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
-along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
-
-For the file sipgen/parser.c, copyright and license is:
-
-/* A Bison parser, made by GNU Bison 2.3.  */
-
-/* Skeleton implementation for Bison's Yacc-like parsers in C
-
-   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
-   Free Software Foundation, Inc.
-
-   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 (at your option)
-   any later version.
-
-   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
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.  */
-
-/* As a special exception, you may create a larger work that contains
-   part or all of the Bison parser skeleton and distribute that work
-   under terms of your choice, so long as that work isn't itself a
-   parser generator using the skeleton or a modified version thereof
-   as a parser skeleton.  Alternatively, if you modify or redistribute
-   the parser skeleton itself, you may (at your option) remove this
-   special exception, which will cause the skeleton and the resulting
-   Bison output files to be licensed under the GNU General Public
-   License without this special exception.
-
-   This special exception was added by the Free Software Foundation in
-   version 2.2 of Bison.  */
-
-
-On Debian systems, the complete text of the GNU General Public License 2
-can be found in `/usr/share/common-licenses/GPL-2'. The complete text of the
-GNU General Public License 3 can be found in `/usr/share/common-licenses/GPL-3'.
+Files: debian/*
+Copyright: 2000-2004, Ricardo Javier Cardenes Medina <rcardenes at debian.org>
+           2005-2010, Torsten Marek <shlomme at debian.org>
+           2007-2011, Piotr OÅ¼arowski <piotr at debian.org>
+           2009,      Bernd Zeimetz <bzed at debian.org>
+           2009-2011, Michael Casadevall <mcasadevall at debian.org>
+           2011,      MichaÅ‚ ZajÄ…c <michal.zajac at gmail.com>
+           2011-2014, Scott Kitterman <scott at kitterman.com>
+           2013-2014, Dmitry Shachnev <mitya57 at gmail.com>
+           2001-2014, Other Debian contributors
+License:
+ 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 (at your option)
+ any later version.
+ .
+ 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 GNU General Public License
+ version 2 can be found in `/usr/share/common-licenses/GPL-2'.


