Update d/copyright for new release

2 files changed, 57 insertions, 229 deletions

diff --git a/debian/changelog b/debian/changelog
index 1624aba..393cd79 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,10 @@
 pikepdf (3.2.0+dfsg-1) UNRELEASED; urgency=medium
 
   * New upstream release (Closes: #996792).
+  * Update d/copyright for new release.
+    - Drop stanzas for mp_compile.py, QIntC.hh and docs/images/pike-tree.jpg.
+    - Update path docs/images/pike.{jpg->png}.
+    - Add stanza for tests/resources/Gray.icc.
 
  -- Sean Whitton <spwhitton@spwhitton.name>  Mon, 18 Oct 2021 13:29:05 -0700
 
diff --git a/debian/copyright b/debian/copyright
index 183d7e2..fefbe44 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -22,36 +22,11 @@ Comment:
  .
  Also see https://github.com/pikepdf/pikepdf/issues/8
 
-Files: mp_compile.py
-Copyright: (C) 2010-2019 Alex Clark and Pillow contributors
-License: PIL
- 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:
- .
- 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.
- .
- SECRET LABS AB AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO
- THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY 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.
-
-
 Files: debian/*
 Copyright: (C) 2018 Sean Whitton <spwhitton@spwhitton.name>
 License: MPL-2.0
 
-Files: docs/images/pike.jpg tests/resources/pike*jp2.pdf
+Files: docs/images/pike.png tests/resources/pike*jp2.pdf
 Copyright: Public domain
 License: public-domain
  From the U.S. Fish and Wildlife Service National Image Library.
@@ -80,10 +55,6 @@ License: Expat
  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  THE SOFTWARE.
 
-Files: src/QIntC.hh
-Copyright: (C) 2005-2020 Jay Berkenbilt
-License: Apache-2.0 or Artistic-2.0
-
 Files: tests/*.py
 Copyright: (C) 2017 James R. Barlow
 License: CC0-1.0
@@ -92,6 +63,14 @@ Files: tests/resources/*
 Copyright: (C) 2017 James R. Barlow
 License: CC-BY-4.0
 
+Files: tests/resources/Gray.icc
+Copyright:  Kai-Uwe Behrmann <www.behrmann.name>
+ Marti Maria <www.littlecms.com>
+ Photogamut <www.photogamut.org>
+ Graeme Gill <www.argyllcms.com>
+ ColorSolutions <www.basICColor.com>
+License: Zlib
+
 Files: tests/resources/congress.pdf docs/images/congress_im0.jpg tests/resources/congress-gray.pdf
 Copyright: Public domain
 License: public-domain
@@ -164,12 +143,6 @@ License: CC-BY-SA-4.0
 Comment:
  Obtained from: https://commons.wikimedia.org/wiki/File:Release_of_a_pike.jpg
 
-Files: docs/images/pike-tree.jpg
-Copyright: Public domain
-License: CC0-1.0
-Comment:
- Obtained from: https://www.maxpixel.net/Pike-Fish-Fishing-1082782
-
 Files: docs/images/sushi.jpg
 Copyright: (C) 2004 Gérald Anfossi
 License: GFDL-1.2+ or CC-BY-SA-3.0
@@ -2123,199 +2096,6 @@ License: CC-BY-SA-4.0
  .
  Creative Commons may be contacted at creativecommons.org.
 
-License: Artistic-2.0
- Artistic License 2.0
- .
- Copyright (c) 2000-2006, The Perl Foundation.
- .
- Everyone is permitted to copy and distribute verbatim copies of this
- license document, but changing it is not allowed.
- .
- Preamble
- .
- This license establishes the terms under which a given free software
- Package may be copied, modified, distributed, and/or
- redistributed. The intent is that the Copyright Holder maintains some
- artistic control over the development of that Package while still
- keeping the Package available as open source and free software.
- .
- You are always permitted to make arrangements wholly outside of this
- license directly with the Copyright Holder of a given Package. If the
- terms of this license do not permit the full use that you propose to
- make of the Package, you should contact the Copyright Holder and seek
- a different licensing arrangement.
- .
- Definitions
- .
-    "Copyright Holder" means the individual(s) or organization(s) named
-    in the copyright notice for the entire Package.
- .
-    "Contributor" means any party that has contributed code or other
-    material to the Package, in accordance with the Copyright Holder's
-    procedures.
- .
-    "You" and "your" means any person who would like to copy,
-    distribute, or modify the Package.
- .
-    "Package" means the collection of files distributed by the
-    Copyright Holder, and derivatives of that collection and/or of
-    those files. A given Package may consist of either the Standard
-    Version, or a Modified Version.
- .
-    "Distribute" means providing a copy of the Package or making it
-    accessible to anyone else, or in the case of a company or
-    organization, to others outside of your company or organization.
- .
-    "Distributor Fee" means any fee that you charge for Distributing
-    this Package or providing support for this Package to another
-    party. It does not mean licensing fees.
- .
-    "Standard Version" refers to the Package if it has not been
-    modified, or has been modified only in ways explicitly requested by
-    the Copyright Holder.
- .
-    "Modified Version" means the Package, if it has been changed, and
-    such changes were not explicitly requested by the Copyright Holder.
- .
-    "Original License" means this Artistic License as Distributed with
-    the Standard Version of the Package, in its current version or as
-    it may be modified by The Perl Foundation in the future.
- .
-    "Source" form means the source code, documentation source, and
-    configuration files for the Package.
- .
-    "Compiled" form means the compiled bytecode, object code, binary,
-    or any other form resulting from mechanical transformation or
-    translation of the Source form.
- .
- Permission for Use and Modification Without Distribution
- .
- (1) You are permitted to use the Standard Version and create and use
- Modified Versions for any purpose without restriction, provided that
- you do not Distribute the Modified Version.
- .
- Permissions for Redistribution of the Standard Version
- .
- (2) You may Distribute verbatim copies of the Source form of the
- Standard Version of this Package in any medium without restriction,
- either gratis or for a Distributor Fee, provided that you duplicate
- all of the original copyright notices and associated disclaimers. At
- your discretion, such verbatim copies may or may not include a
- Compiled form of the Package.
- .
- (3) You may apply any bug fixes, portability changes, and other
- modifications made available from the Copyright Holder. The resulting
- Package will still be considered the Standard Version, and as such
- will be subject to the Original License.
- .
- Distribution of Modified Versions of the Package as Source
- .
- (4) You may Distribute your Modified Version as Source (either gratis
- or for a Distributor Fee, and with or without a Compiled form of the
- Modified Version) provided that you clearly document how it differs
- from the Standard Version, including, but not limited to, documenting
- any non-standard features, executables, or modules, and provided that
- you do at least ONE of the following:
- .
-    (a) make the Modified Version available to the Copyright Holder of
-    the Standard Version, under the Original License, so that the
-    Copyright Holder may include your modifications in the Standard
-    Version.
- .
-    (b) ensure that installation of your Modified Version does not
-    prevent the user installing or running the Standard Version. In
-    addition, the Modified Version must bear a name that is different
-    from the name of the Standard Version.
- .
-    (c) allow anyone who receives a copy of the Modified Version to
-    make the Source form of the Modified Version available to others
-    under
- .
-       (i) the Original License or
- .
-       (ii) a license that permits the licensee to freely copy, modify
-       and redistribute the Modified Version using the same licensing
-       terms that apply to the copy that the licensee received, and
-       requires that the Source form of the Modified Version, and of
-       any works derived from it, be made freely available in that
-       license fees are prohibited but Distributor Fees are allowed.
-       Distribution of Compiled Forms of the Standard Version or
-       Modified Versions without the Source
- .
- (5) You may Distribute Compiled forms of the Standard Version without
- the Source, provided that you include complete instructions on how to
- get the Source of the Standard Version. Such instructions must be
- valid at the time of your distribution. If these instructions, at any
- time while you are carrying out such distribution, become invalid, you
- must provide new instructions on demand or cease further
- distribution. If you provide valid instructions or cease distribution
- within thirty days after you become aware that the instructions are
- invalid, then you do not forfeit any of your rights under this
- license.
- .
- (6) You may Distribute a Modified Version in Compiled form without the
- Source, provided that you comply with Section 4 with respect to the
- Source of the Modified Version.
- .
- Aggregating or Linking the Package
- .
- (7) You may aggregate the Package (either the Standard Version or
- Modified Version) with other packages and Distribute the resulting
- aggregation provided that you do not charge a licensing fee for the
- Package. Distributor Fees are permitted, and licensing fees for other
- components in the aggregation are permitted. The terms of this license
- apply to the use and Distribution of the Standard or Modified Versions
- as included in the aggregation.
- .
- (8) You are permitted to link Modified and Standard Versions with
- other works, to embed the Package in a larger work of your own, or to
- build stand-alone binary or bytecode versions of applications that
- include the Package, and Distribute the result without restriction,
- provided the result does not expose a direct interface to the Package.
- .
- Items That are Not Considered Part of a Modified Version
- .
- (9) Works (including, but not limited to, modules and scripts) that
- merely extend or make use of the Package, do not, by themselves, cause
- the Package to be a Modified Version. In addition, such works are not
- considered parts of the Package itself, and are not subject to the
- terms of this license.
- .
- General Provisions
- .
- (10) Any use, modification, and distribution of the Standard or
- Modified Versions is governed by this Artistic License. By using,
- modifying or distributing the Package, you accept this license. Do not
- use, modify, or distribute the Package, if you do not accept this
- license.
- .
- (11) If your Modified Version has been derived from a Modified Version
- made by someone other than you, you are nevertheless required to
- ensure that your Modified Version complies with the requirements of
- this license.
- .
- (12) This license does not grant you the right to use any trademark,
- service mark, tradename, or logo of the Copyright Holder.
- .
- (13) This license includes the non-exclusive, worldwide,
- free-of-charge patent license to make, have made, use, offer to sell,
- sell, import and otherwise transfer the Package with respect to any
- patent claims licensable by the Copyright Holder that are necessarily
- infringed by the Package. If you institute patent litigation
- (including a cross-claim or counterclaim) against any party alleging
- that the Package constitutes direct or contributory patent
- infringement, then this Artistic License to you shall terminate on the
- date that such litigation is filed.
- .
- (14) Disclaimer of Warranty: THE PACKAGE IS PROVIDED BY THE COPYRIGHT
- HOLDER AND CONTRIBUTORS "AS IS' AND WITHOUT ANY EXPRESS OR IMPLIED
- WARRANTIES. THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
- PARTICULAR PURPOSE, OR NON-INFRINGEMENT ARE DISCLAIMED TO THE EXTENT
- PERMITTED BY YOUR LOCAL LAW.  UNLESS REQUIRED BY LAW, NO COPYRIGHT
- HOLDER OR CONTRIBUTOR WILL BE LIABLE FOR ANY DIRECT, INDIRECT,
- INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING IN ANY WAY OUT OF THE USE
- OF THE PACKAGE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
 License: CC-BY-SA-1.0
  THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS
  CREATIVE COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS
@@ -2962,3 +2742,47 @@ License: CC-BY-SA-2.5
 License: Apache-2.0
  On Debian systems the full text of the Apache-2.0 license can be found in
  /usr/share/common-licenses/Apache-2.0.
+
+License: Zlib
+ The zlib/libpng License
+ .
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+ .
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+ .
+    1. The origin of this software must not be misrepresented; you must not
+    claim that you wrote the original software. If you use this software
+    in a product, an acknowledgment in the product documentation would be
+    appreciated but is not required.
+ .
+    2. Altered source versions must be plainly marked as such, and must not be
+    misrepresented as being the original software.
+ .
+    3. This notice may not be removed or altered from any source
+    distribution.
+ .
+ NO WARRANTY
+ .
+   BECAUSE THE DATA IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+ FOR THE DATA, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+ OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+ PROVIDE THE DATA "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+ OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+ TO THE QUALITY AND PERFORMANCE OF THE DATA IS WITH YOU.  SHOULD THE
+ DATA PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+ REPAIR OR CORRECTION.
+ .
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+ WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+ REDISTRIBUTE THE DATA AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+ INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+ OUT OF THE USE OR INABILITY TO USE THE DATA (INCLUDING BUT NOT LIMITED
+ TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+ YOU OR THIRD PARTIES OR A FAILURE OF THE DATA TO OPERATE WITH ANY OTHER
+ PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+ POSSIBILITY OF SUCH DAMAGES.