Version in base suite: 2.11.1+1.0.3-1 Base version: php-proxy-manager_2.11.1+1.0.3-1 Target version: php-proxy-manager_2.11.1+1.0.3-1+deb11u1 Base file: /srv/ftp-master.debian.org/ftp/pool/main/p/php-proxy-manager/php-proxy-manager_2.11.1+1.0.3-1.dsc Target file: /srv/ftp-master.debian.org/policy/pool/main/p/php-proxy-manager/php-proxy-manager_2.11.1+1.0.3-1+deb11u1.dsc autoload.php.tpl | 2 +- changelog | 7 +++++++ clean | 4 +++- control | 2 +- gbp.conf | 2 +- patches/0001-Also-skip-system-classes-during-tests.patch | 11 ++++++----- rules | 4 +++- tests/control | 2 +- 8 files changed, 23 insertions(+), 11 deletions(-) diff -Nru php-proxy-manager-2.11.1+1.0.3/debian/autoload.php.tpl php-proxy-manager-2.11.1+1.0.3/debian/autoload.php.tpl --- php-proxy-manager-2.11.1+1.0.3/debian/autoload.php.tpl 2021-01-27 19:55:23.000000000 +0000 +++ php-proxy-manager-2.11.1+1.0.3/debian/autoload.php.tpl 2024-02-18 11:10:10.000000000 +0000 @@ -1,6 +1,6 @@ Sun, 18 Feb 2024 12:10:39 +0100 + php-proxy-manager (2.11.1+1.0.3-1) unstable; urgency=medium [ Nicolas Grekas ] diff -Nru php-proxy-manager-2.11.1+1.0.3/debian/clean php-proxy-manager-2.11.1+1.0.3/debian/clean --- php-proxy-manager-2.11.1+1.0.3/debian/clean 2021-01-15 02:02:22.000000000 +0000 +++ php-proxy-manager-2.11.1+1.0.3/debian/clean 2024-02-18 11:10:10.000000000 +0000 @@ -1,4 +1,6 @@ .phpunit.result.cache -ProxyManager +Laminas +ProxyManager/ src/ProxyManager/autoload.php +Symfony vendor/ diff -Nru php-proxy-manager-2.11.1+1.0.3/debian/control php-proxy-manager-2.11.1+1.0.3/debian/control --- php-proxy-manager-2.11.1+1.0.3/debian/control 2021-01-27 20:03:45.000000000 +0000 +++ php-proxy-manager-2.11.1+1.0.3/debian/control 2024-02-18 11:10:10.000000000 +0000 @@ -12,7 +12,7 @@ pkg-php-tools Standards-Version: 4.5.1 Homepage: https://github.com/FriendsOfPHP/proxy-manager-lts -Vcs-Git: https://salsa.debian.org/php-team/pear/php-proxy-manager.git -b debian/lts +Vcs-Git: https://salsa.debian.org/php-team/pear/php-proxy-manager.git -b debian/bullseye Vcs-Browser: https://salsa.debian.org/php-team/pear/php-proxy-manager Rules-Requires-Root: no diff -Nru php-proxy-manager-2.11.1+1.0.3/debian/gbp.conf php-proxy-manager-2.11.1+1.0.3/debian/gbp.conf --- php-proxy-manager-2.11.1+1.0.3/debian/gbp.conf 2021-01-27 19:55:23.000000000 +0000 +++ php-proxy-manager-2.11.1+1.0.3/debian/gbp.conf 2024-02-18 11:10:10.000000000 +0000 @@ -1,5 +1,5 @@ [DEFAULT] -debian-branch = debian/lts +debian-branch = debian/bullseye pristine-tar = True pristine-tar-commit = True upstream-branch = upstream-lts diff -Nru php-proxy-manager-2.11.1+1.0.3/debian/patches/0001-Also-skip-system-classes-during-tests.patch php-proxy-manager-2.11.1+1.0.3/debian/patches/0001-Also-skip-system-classes-during-tests.patch --- php-proxy-manager-2.11.1+1.0.3/debian/patches/0001-Also-skip-system-classes-during-tests.patch 2021-01-27 19:55:23.000000000 +0000 +++ php-proxy-manager-2.11.1+1.0.3/debian/patches/0001-Also-skip-system-classes-during-tests.patch 2024-02-18 11:10:10.000000000 +0000 @@ -3,22 +3,23 @@ Subject: Also skip system classes during tests --- - tests/ProxyManagerTest/Functional/FatalPreventionFunctionalTest.php | 2 ++ - 1 file changed, 2 insertions(+) + tests/ProxyManagerTest/Functional/FatalPreventionFunctionalTest.php | 3 +++ + 1 file changed, 3 insertions(+) diff --git a/tests/ProxyManagerTest/Functional/FatalPreventionFunctionalTest.php b/tests/ProxyManagerTest/Functional/FatalPreventionFunctionalTest.php -index 146eeb0..abded91 100644 +index 146eeb0..37cceb8 100644 --- a/tests/ProxyManagerTest/Functional/FatalPreventionFunctionalTest.php +++ b/tests/ProxyManagerTest/Functional/FatalPreventionFunctionalTest.php -@@ -112,6 +112,7 @@ final class FatalPreventionFunctionalTest extends TestCase +@@ -112,6 +112,8 @@ final class FatalPreventionFunctionalTest extends TestCase realpath(__DIR__ . '/../../../src'), realpath(__DIR__ . '/../../../vendor'), realpath(__DIR__ . '/../../ProxyManagerTest'), ++ realpath(__DIR__ . '/../../../ProxyManager'), + realpath('/usr/share/php'), ]; return array_filter( -@@ -138,6 +139,7 @@ final class FatalPreventionFunctionalTest extends TestCase +@@ -138,6 +140,7 @@ final class FatalPreventionFunctionalTest extends TestCase if (strpos($realPath, $skippedPath) === 0) { // skip classes defined within ProxyManager, vendor or the test suite diff -Nru php-proxy-manager-2.11.1+1.0.3/debian/rules php-proxy-manager-2.11.1+1.0.3/debian/rules --- php-proxy-manager-2.11.1+1.0.3/debian/rules 2021-01-27 19:55:23.000000000 +0000 +++ php-proxy-manager-2.11.1+1.0.3/debian/rules 2024-02-18 11:10:10.000000000 +0000 @@ -15,7 +15,9 @@ tests/ProxyManagerTest \ tests/ProxyManagerTestAsset \ tests/Stubbed/Laminas/Server - ln -s src/ProxyManager . + cp -r src/ProxyManager . + ln -s /usr/share/php/Laminas . + ln -s /usr/share/php/Symfony . override_dh_auto_test: phpunit diff -Nru php-proxy-manager-2.11.1+1.0.3/debian/tests/control php-proxy-manager-2.11.1+1.0.3/debian/tests/control --- php-proxy-manager-2.11.1+1.0.3/debian/tests/control 2021-01-27 19:55:23.000000000 +0000 +++ php-proxy-manager-2.11.1+1.0.3/debian/tests/control 2024-02-18 11:10:10.000000000 +0000 @@ -1,3 +1,3 @@ -Test-Command: mkdir --parents vendor && phpab --output vendor/autoload.php --template debian/autoload.tests.php.tpl tests/ProxyManagerTest tests/ProxyManagerTestAsset tests/Stubbed/Laminas/Server && phpunit +Test-Command: mkdir --parents vendor ProxyManager && phpab --output vendor/autoload.php --template debian/autoload.tests.php.tpl tests/ProxyManagerTest tests/ProxyManagerTestAsset tests/Stubbed/Laminas/Server && phpunit Restrictions: rw-build-tree Depends: composer, php-symfony-filesystem, phpab, phpunit, @