Control: tags 977824 + pending Dear maintainer,
I've prepared an NMU for php-imagick (versioned as 3.4.4-4.2) and uploaded it to DELAYED/5. Please feel free to tell me if I should delay it longer. The patch is also available as a pull request on salsa: https://salsa.debian.org/php-team/pecl/php-imagick/-/merge_requests/2 Regards. David
diff -Nru php-imagick-3.4.4/debian/changelog php-imagick-3.4.4/debian/changelog --- php-imagick-3.4.4/debian/changelog 2020-06-14 05:26:18.000000000 -0400 +++ php-imagick-3.4.4/debian/changelog 2020-12-28 09:09:48.000000000 -0400 @@ -1,3 +1,10 @@ +php-imagick (3.4.4-4.2) unstable; urgency=medium + + * Non-maintainer upload. + * Adapt to recent version of PHPUnit (9) (Closes: #977824) + + -- David Prévot <taf...@debian.org> Mon, 28 Dec 2020 09:09:48 -0400 + php-imagick (3.4.4-4.1) unstable; urgency=low * Non-maintainer upload. diff -Nru php-imagick-3.4.4/debian/patches/0011-Void-expectation-is-not-allowed-with-PHPUnit-9.patch php-imagick-3.4.4/debian/patches/0011-Void-expectation-is-not-allowed-with-PHPUnit-9.patch --- php-imagick-3.4.4/debian/patches/0011-Void-expectation-is-not-allowed-with-PHPUnit-9.patch 1969-12-31 20:00:00.000000000 -0400 +++ php-imagick-3.4.4/debian/patches/0011-Void-expectation-is-not-allowed-with-PHPUnit-9.patch 2020-12-28 09:08:42.000000000 -0400 @@ -0,0 +1,20 @@ +From: =?utf-8?q?David_Pr=C3=A9vot?= <taf...@debian.org> +Date: Mon, 21 Dec 2020 09:37:41 -0400 +Subject: Void expectation is not allowed with PHPUnit 9 + +Bug-Debian: https://bugs.debian.org/977824 +--- + imagick-3.4.4/tests/bug_72226.phpt | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/imagick-3.4.4/tests/bug_72226.phpt b/imagick-3.4.4/tests/bug_72226.phpt +index 6ad5631..6724b87 100644 +--- a/imagick-3.4.4/tests/bug_72226.phpt ++++ b/imagick-3.4.4/tests/bug_72226.phpt +@@ -19,4 +19,5 @@ if (class_exists('ImagickKernelException', false) == true) { + } + + ?> +---EXPECTF-- ++--EXPECTREGEX-- ++^$ diff -Nru php-imagick-3.4.4/debian/patches/series php-imagick-3.4.4/debian/patches/series --- php-imagick-3.4.4/debian/patches/series 2020-06-14 05:23:59.000000000 -0400 +++ php-imagick-3.4.4/debian/patches/series 2020-12-28 09:09:26.000000000 -0400 @@ -4,3 +4,4 @@ 0003-Disable-test-014-which-fails-due-to-system-resources.patch 0004-Disable-remaining-tests-failing-with-7.4.patch armel.patch +0011-Void-expectation-is-not-allowed-with-PHPUnit-9.patch
signature.asc
Description: PGP signature
