Control: tags 952899 + pending Dear maintainer,
I've prepared an NMU for pillow (versioned as 8.1.2+dfsg-0.1) and uploaded it to DELAYED/5. Please feel free to tell me if I should delay it longer. Regards.
diff -Nru pillow-8.1.2/debian/changelog pillow-8.1.2+dfsg/debian/changelog --- pillow-8.1.2/debian/changelog 2021-03-09 08:12:51.000000000 +0100 +++ pillow-8.1.2+dfsg/debian/changelog 2021-04-24 15:51:24.000000000 +0200 @@ -1,3 +1,11 @@ +pillow (8.1.2+dfsg-0.1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Repack for DFSG compliance and update d/copyright. Closes: #952899. + * Update d/watch for +dfsg repack. + + -- Romain Porte <deb...@microjoe.org> Sat, 24 Apr 2021 15:51:24 +0200 + pillow (8.1.2-1) unstable; urgency=high * New upstream version. diff -Nru pillow-8.1.2/debian/copyright pillow-8.1.2+dfsg/debian/copyright --- pillow-8.1.2/debian/copyright 2020-04-27 10:22:45.000000000 +0200 +++ pillow-8.1.2+dfsg/debian/copyright 2021-04-24 15:51:24.000000000 +0200 @@ -4,6 +4,14 @@ It was downloaded from https://pypi.python.org/pypi/Pillow/ +Files excluded because of missing license data: + + Tests/images/a.fli + Tests/test_file_fli.py + Tests/test_file_mcidas.py + Tests/images/cmx3g8_wv_1998.260_0745_mcidas.ara + Tests/images/cmx3g8_wv_1998.260_0745_mcidas.png + Copyright: The Python Imaging Library is @@ -38,9 +46,15 @@ NotoNastaliqUrdu-Regular.ttf, NotoSansSymbols-Regular.ttf from https://github.com/googlei18n/noto-fonts -NotoSansJP-Thin.otf +NotoSans-Regular.ttf + from https://www.google.com/get/noto/ + +NotoSansJP-Regular.otf from https://www.google.com/get/noto/help/cjk/ +NotoColorEmoji.ttf + from https://github.com/googlefonts/noto-emoji + AdobeVFPrototype.ttf from https://github.com/adobe-fonts/adobe-variable-font-prototype @@ -48,16 +62,126 @@ from http://velvetyne.fr/fonts/tiny ArefRuqaa-Regular.ttf - from https://github.com/google/fonts/tree/master/ofl/arefruqaater-x20b.pcf + from https://github.com/google/fonts/tree/master/ofl/arefruqaa + +ter-x20b.pcf from http://terminus-font.sourceforge.net/ +BungeeColor-Regular_colr_Windows.ttf + from https://github.com/djrrb/bungee + All of the above fonts are published under the SIL Open Font License (OFL) v1.1 (http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&id=OFL), which allows you to copy, modify, and redistribute them if you need to. +FreeMono.ttf + +Licensed under GPL3 with GPL font exception + +Tests/fonts/OpenSansCondensed-LightItalic.ttf + from https://fonts.google.com/specimen/Open+Sans + +Licensed under Apache 2.0 + +DejaVuSans-24-*-stripped.ttf + +based on DejaVuSans.ttf converted using FontForge to add bitmap strikes and +keep only the ASCII range. + 10x20-ISO8859-1.pcf, from https://packages.ubuntu.com/xenial/xfonts-base "Public domain font. Share and enjoy." +Tests/images/bmp/* from https://github.com/jsummers/bmpsuite + +Public domain + +docs/example/DdsImagePlugin.py +src/PIL/BlpImagePlugin.py +src/PIL/DdsImagePlugin.py +src/PIL/FtexImagePlugin.py +src/libImaging/BcnDecode.c + +Public domain (CC0) +Full text of the CC0 license: + https://creativecommons.org/publicdomain/zero/1.0/ + +src/libImaging/QuantOctree.c + + Copyright 2010 Oliver Tonnhofer <o...@bogosoft.com>, Omniscale + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + . + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + . + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. + + +src/Tk/_tkmini.h + + Copyright + 1987-1994 The Regents of the University of California. + 1993-1996 Lucent Technologies. + 1994-1998 Sun Microsystems, Inc. + 1998-2000 by Scriptics Corporation. + 2002 by Kevin B. Kenny. All rights reserved. + + This software is copyrighted by the Regents of the University + of California, Sun Microsystems, Inc., Scriptics Corporation, + and other parties. The following terms apply to all files + associated with the software unless explicitly disclaimed in + individual files. + . + The authors hereby grant permission to use, copy, modify, + distribute, and license this software and its documentation + for any purpose, provided that existing copyright notices are + retained in all copies and that this notice is included + verbatim in any distributions. No written agreement, license, + or royalty fee is required for any of the authorized uses. + Modifications to this software may be copyrighted by their + authors and need not follow the licensing terms described + here, provided that the new terms are clearly indicated on + the first page of each file where they apply. + . + IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO + ANY PARTY FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR + CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OF THIS + SOFTWARE, ITS DOCUMENTATION, OR ANY DERIVATIVES THEREOF, EVEN + IF THE AUTHORS HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH + DAMAGE. + . + THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY + WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR + PURPOSE, AND NON-INFRINGEMENT. THIS SOFTWARE IS PROVIDED ON + AN "AS IS" BASIS, AND THE AUTHORS AND DISTRIBUTORS HAVE NO + OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, + ENHANCEMENTS, OR MODIFICATIONS. + . + GOVERNMENT USE: If you are acquiring this software on behalf + of the U.S. government, the Government shall have only + "Restricted Rights" in the software and related documentation + as defined in the Federal Acquisition Regulations (FARs) in + Clause 52.227.19 (c) (2). If you are acquiring the software + on behalf of the Department of Defense, the software shall be + classified as "Commercial Computer Software" and the + Government shall have only "Restricted Rights" as defined in + Clause 252.227-7013 (c) (1) of DFARs. Notwithstanding the + foregoing, the authors grant the U.S. Government and others + acting in its behalf permission to use and distribute the + software in accordance with the terms specified in this + license diff -Nru pillow-8.1.2/debian/watch pillow-8.1.2+dfsg/debian/watch --- pillow-8.1.2/debian/watch 2015-06-01 17:57:35.000000000 +0200 +++ pillow-8.1.2+dfsg/debian/watch 2021-04-24 15:51:24.000000000 +0200 @@ -1,2 +1,3 @@ version=3 +opts="oversionmangle=s/(.*)/$1+dfsg/, dversionmangle=s/\+dfsg\d*$//" \ http://pypi.debian.net/Pillow/Pillow-(.*)\.(?:tar\.gz|zip) Les fichiers binaires /tmp/9Uo1casa4D/pillow-8.1.2/Tests/images/a.fli et /tmp/rcrsJNUtF_/pillow-8.1.2+dfsg/Tests/images/a.fli sont différents Les fichiers binaires /tmp/9Uo1casa4D/pillow-8.1.2/Tests/images/cmx3g8_wv_1998.260_0745_mcidas.ara et /tmp/rcrsJNUtF_/pillow-8.1.2+dfsg/Tests/images/cmx3g8_wv_1998.260_0745_mcidas.ara sont différents Les fichiers binaires /tmp/9Uo1casa4D/pillow-8.1.2/Tests/images/cmx3g8_wv_1998.260_0745_mcidas.png et /tmp/rcrsJNUtF_/pillow-8.1.2+dfsg/Tests/images/cmx3g8_wv_1998.260_0745_mcidas.png sont différents diff -Nru pillow-8.1.2/Tests/test_file_fli.py pillow-8.1.2+dfsg/Tests/test_file_fli.py --- pillow-8.1.2/Tests/test_file_fli.py 2021-03-06 06:17:25.000000000 +0100 +++ pillow-8.1.2+dfsg/Tests/test_file_fli.py 1970-01-01 01:00:00.000000000 +0100 @@ -1,126 +0,0 @@ -import pytest - -from PIL import FliImagePlugin, Image - -from .helper import assert_image_equal, is_pypy - -# created as an export of a palette image from Gimp2.6 -# save as...-> hopper.fli, default options. -static_test_file = "Tests/images/hopper.fli" - -# From https://samples.libav.org/fli-flc/ -animated_test_file = "Tests/images/a.fli" - - -def test_sanity(): - with Image.open(static_test_file) as im: - im.load() - assert im.mode == "P" - assert im.size == (128, 128) - assert im.format == "FLI" - assert not im.is_animated - - with Image.open(animated_test_file) as im: - assert im.mode == "P" - assert im.size == (320, 200) - assert im.format == "FLI" - assert im.info["duration"] == 71 - assert im.is_animated - - -@pytest.mark.skipif(is_pypy(), reason="Requires CPython") -def test_unclosed_file(): - def open(): - im = Image.open(static_test_file) - im.load() - - pytest.warns(ResourceWarning, open) - - -def test_closed_file(): - def open(): - im = Image.open(static_test_file) - im.load() - im.close() - - pytest.warns(None, open) - - -def test_context_manager(): - def open(): - with Image.open(static_test_file) as im: - im.load() - - pytest.warns(None, open) - - -def test_tell(): - # Arrange - with Image.open(static_test_file) as im: - - # Act - frame = im.tell() - - # Assert - assert frame == 0 - - -def test_invalid_file(): - invalid_file = "Tests/images/flower.jpg" - - with pytest.raises(SyntaxError): - FliImagePlugin.FliImageFile(invalid_file) - - -def test_n_frames(): - with Image.open(static_test_file) as im: - assert im.n_frames == 1 - assert not im.is_animated - - with Image.open(animated_test_file) as im: - assert im.n_frames == 384 - assert im.is_animated - - -def test_eoferror(): - with Image.open(animated_test_file) as im: - n_frames = im.n_frames - - # Test seeking past the last frame - with pytest.raises(EOFError): - im.seek(n_frames) - assert im.tell() < n_frames - - # Test that seeking to the last frame does not raise an error - im.seek(n_frames - 1) - - -def test_seek_tell(): - with Image.open(animated_test_file) as im: - - layer_number = im.tell() - assert layer_number == 0 - - im.seek(0) - layer_number = im.tell() - assert layer_number == 0 - - im.seek(1) - layer_number = im.tell() - assert layer_number == 1 - - im.seek(2) - layer_number = im.tell() - assert layer_number == 2 - - im.seek(1) - layer_number = im.tell() - assert layer_number == 1 - - -def test_seek(): - with Image.open(animated_test_file) as im: - im.seek(50) - - with Image.open("Tests/images/a_fli.png") as expected: - assert_image_equal(im, expected) diff -Nru pillow-8.1.2/Tests/test_file_mcidas.py pillow-8.1.2+dfsg/Tests/test_file_mcidas.py --- pillow-8.1.2/Tests/test_file_mcidas.py 2021-03-06 06:17:25.000000000 +0100 +++ pillow-8.1.2+dfsg/Tests/test_file_mcidas.py 1970-01-01 01:00:00.000000000 +0100 @@ -1,31 +0,0 @@ -import pytest - -from PIL import Image, McIdasImagePlugin - -from .helper import assert_image_equal - - -def test_invalid_file(): - invalid_file = "Tests/images/flower.jpg" - - with pytest.raises(SyntaxError): - McIdasImagePlugin.McIdasImageFile(invalid_file) - - -def test_valid_file(): - # Arrange - # https://ghrc.nsstc.nasa.gov/hydro/details/cmx3g8 - # https://ghrc.nsstc.nasa.gov/pub/fieldCampaigns/camex3/cmx3g8/browse/ - test_file = "Tests/images/cmx3g8_wv_1998.260_0745_mcidas.ara" - saved_file = "Tests/images/cmx3g8_wv_1998.260_0745_mcidas.png" - - # Act - with Image.open(test_file) as im: - im.load() - - # Assert - assert im.format == "MCIDAS" - assert im.mode == "I" - assert im.size == (1800, 400) - with Image.open(saved_file) as im2: - assert_image_equal(im, im2)
