Hallo! Du (Santiago Vila) hast geschrieben: >Hi. I see you already uploaded to one of the delayed/* queues. > >I would like to make a proper team upload for this, so it would help >if you could post here the diff -ru between old (1.11.0-0.1) and new >(1.12.0-0.1) (only the debian/* directory). > >(I'm mostly interested to know what happens with debian/patches, if >you already figured that out. Are they still necessary, or they have >been adopted upstream?).
>In the meantime, I've just used gbp to import the version 1.11.0-0.1 >to salsa. > >Also: I'm upgrading this to normal because I understand this affects >other packages and also one does normally not make a NMU to fix a >wishlist bug... I don't do NMUs often so I'm not so familiar with the correct process, beyond a quick research before I uploaded the package. My changes (and now i recognize that I missed to mention some of the changes in the changelog.) should be: * new upstream repo * updated debhelper * update debian/control * converted debian/watch to v5 * refreshed patches, as there were partly applied upstream Cord full diff of .../debian -------------------------------------------------- diff -Nrdb willow-1.11.0/debian/changelog /home/cord/tmp/debian/changelog 0a1,7 > willow (1.12.0-0.1) unstable; urgency=medium > > * Non-maintainer upload. > * New upstream release. Closes: #1142959 > > -- Cord Beermann <[email protected]> Mon, 27 Jul 2026 23:10:18 +0200 > diff -Nrdb willow-1.11.0/debian/control /home/cord/tmp/debian/control 5d4 < Priority: optional 7c6,7 < Build-Depends: debhelper-compat (= 13), --- > Build-Depends: debhelper-compat (= 14), > dh-sequence-single-binary, 17,18c17,18 < Standards-Version: 4.6.2 < Homepage: https://github.com/torchbox/Willow --- > Standards-Version: 4.7.4 > Homepage: https://github.com/wagtail/Willow 21d20 < Rules-Requires-Root: no diff -Nrdb willow-1.11.0/debian/patches/0001_skip-avif-heic-tests-saved.patch /home/cord/tmp/debian/patches/0001_skip-avif-heic-tests-saved.patch 1,51d0 < Description: skip HEIC and AVIF tests < These fail, probably due to missing support in PIL or wand < Author: Stephan Lachnit <[email protected]> < Forwarded: not-needed < Last-Update: 2023-10-25 < < --- a/tests/test_image.py < +++ b/tests/test_image.py < @@ -173,6 +173,7 @@ class TestImageFormats(unittest.TestCase < self.assertEqual(height, 241) < self.assertEqual(image.mime_type, "image/webp") < < + @unittest.expectedFailure # no HEIC support < def test_heic(self): < with open("tests/images/tree.heic", "rb") as f: < image = Image.open(f) < @@ -183,6 +184,7 @@ class TestImageFormats(unittest.TestCase < self.assertEqual(height, 241) < self.assertEqual(image.mime_type, "image/heic") < < + @unittest.expectedFailure # no AVIF support < def test_avif(self): < with open("tests/images/tree.avif", "rb") as f: < image = Image.open(f) < @@ -218,6 +220,7 @@ class TestSaveImage(unittest.TestCase): < image.save("jpeg", "outfile") < image.save_as_jpeg.assert_called_with("outfile", apply_optimizers=True) < < + @unittest.expectedFailure # no HEIC support < def test_save_as_heic(self): < with open("tests/images/sails.bmp", "rb") as f: < image = Image.open(f) < @@ -228,6 +231,7 @@ class TestSaveImage(unittest.TestCase): < self.assertIsInstance(image, HeicImageFile) < self.assertEqual(image.mime_type, "image/heic") < < + @unittest.expectedFailure # no AVIF support < def test_save_as_avif(self): < with open("tests/images/sails.bmp", "rb") as f: < image = Image.open(f) < --- a/tests/test_wand.py < +++ b/tests/test_wand.py < @@ -21,7 +21,7 @@ from willow.plugins.wand import Unsuppor < from willow.registry import registry < < no_webp_support = not WandImage.is_format_supported("WEBP") < -no_avif_support = not WandImage.is_format_supported("AVIF") < +no_avif_support = True # AVIF requires imagemagick v7 < < < class TestWandOperations(unittest.TestCase): diff -Nrdb willow-1.11.0/debian/patches/0003_fix-flaky-wand-webp-test.patch /home/cord/tmp/debian/patches/0003_fix-flaky-wand-webp-test.patch 9c9 < @@ -373,7 +373,7 @@ class TestWandOperations(unittest.TestCa --- > @@ -373,7 +373,7 @@ diff -Nrdb willow-1.11.0/debian/watch /home/cord/tmp/debian/watch 1,4c1,5 < # please also check https://pypi.debian.net/Willow/watch < version=3 < opts="filenamemangle=s/.+\/v?(\d\S+)\.tar\.gz/willow-$1\.tar\.gz/,dversionmangle=s/\+dfsg$//,repacksuffix=+dfsg" \ < https://github.com/wagtail/Willow/tags .*/v?(\d\S+)\.tar\.gz --- > Version: 5 > Template: Github > Owner: wagtail > Project: Willow > Update-Script: uupdate
