Version in base suite: 4.0.0-2

Base version: php-zend-code_4.0.0-2
Target version: php-zend-code_4.0.0-2+deb11u1
Base file: /srv/ftp-master.debian.org/ftp/pool/main/p/php-zend-code/php-zend-code_4.0.0-2.dsc
Target file: /srv/ftp-master.debian.org/policy/pool/main/p/php-zend-code/php-zend-code_4.0.0-2+deb11u1.dsc

 autoload.php.tpl |    8 +++-----
 changelog        |    7 +++++++
 clean            |    1 +
 control          |    2 +-
 gbp.conf         |    2 +-
 rules            |    5 ++++-
 6 files changed, 17 insertions(+), 8 deletions(-)

diff -Nru php-zend-code-4.0.0/debian/autoload.php.tpl php-zend-code-4.0.0/debian/autoload.php.tpl
--- php-zend-code-4.0.0/debian/autoload.php.tpl	2021-01-11 19:28:16.000000000 +0000
+++ php-zend-code-4.0.0/debian/autoload.php.tpl	2024-02-18 11:20:19.000000000 +0000
@@ -1,10 +1,8 @@
 <?php
 
-require_once 'Laminas/EventManager/autoload.php';
-if (stream_resolve_include_path('Doctrine/Common/Annotations/autoload.php')){
-    include_once 'Doctrine/Common/Annotations/autoload.php';
-}
-// include_once 'Laminas/Stdlib/autoload.php'; (already included by EventManager)
+require_once __DIR__ . '/../EventManager/autoload.php';
+if (stream_resolve_include_path(__DIR__ . '/../../Doctrine/Common/Annotations/autoload.php')) { include_once __DIR__ . '/../../Doctrine/Common/Annotations/autoload.php'; }
+// include_once __DIR__ . '/../Stdlib/autoload.php'; (already included by EventManager)
 
 // @codingStandardsIgnoreFile
 // @codeCoverageIgnoreStart
diff -Nru php-zend-code-4.0.0/debian/changelog php-zend-code-4.0.0/debian/changelog
--- php-zend-code-4.0.0/debian/changelog	2021-01-14 03:40:38.000000000 +0000
+++ php-zend-code-4.0.0/debian/changelog	2024-02-18 11:21:22.000000000 +0000
@@ -1,3 +1,10 @@
+php-zend-code (4.0.0-2+deb11u1) bullseye; urgency=medium
+
+  * Track debian/bullseye
+  * Force system dependencies loading
+
+ -- David Prévot <taffit@debian.org>  Sun, 18 Feb 2024 12:21:22 +0100
+
 php-zend-code (4.0.0-2) unstable; urgency=medium
 
   * Upload to unstable in sync with (reverse-)dependencies
diff -Nru php-zend-code-4.0.0/debian/clean php-zend-code-4.0.0/debian/clean
--- php-zend-code-4.0.0/debian/clean	2021-01-03 17:07:35.000000000 +0000
+++ php-zend-code-4.0.0/debian/clean	2024-02-18 11:18:12.000000000 +0000
@@ -1,4 +1,5 @@
 .phpunit.result.cache
+Doctrine
 src/autoload.php
 vendor/
 Laminas/
diff -Nru php-zend-code-4.0.0/debian/control php-zend-code-4.0.0/debian/control
--- php-zend-code-4.0.0/debian/control	2021-01-03 17:08:00.000000000 +0000
+++ php-zend-code-4.0.0/debian/control	2024-02-18 11:13:21.000000000 +0000
@@ -12,7 +12,7 @@
                pkg-php-tools
 Standards-Version: 4.5.1
 Homepage: https://docs.laminas.dev/laminas-code/
-Vcs-Git: https://salsa.debian.org/php-team/pear/php-zend-code.git -b debian/latest
+Vcs-Git: https://salsa.debian.org/php-team/pear/php-zend-code.git -b debian/bullseye
 Vcs-Browser: https://salsa.debian.org/php-team/pear/php-zend-code
 Rules-Requires-Root: no
 
diff -Nru php-zend-code-4.0.0/debian/gbp.conf php-zend-code-4.0.0/debian/gbp.conf
--- php-zend-code-4.0.0/debian/gbp.conf	2021-01-03 17:07:35.000000000 +0000
+++ php-zend-code-4.0.0/debian/gbp.conf	2024-02-18 11:13:27.000000000 +0000
@@ -1,5 +1,5 @@
 [DEFAULT]
-debian-branch = debian/latest
+debian-branch = debian/bullseye
 pristine-tar = True
 pristine-tar-commit = True
 
diff -Nru php-zend-code-4.0.0/debian/rules php-zend-code-4.0.0/debian/rules
--- php-zend-code-4.0.0/debian/rules	2021-01-03 17:07:35.000000000 +0000
+++ php-zend-code-4.0.0/debian/rules	2024-02-18 11:21:22.000000000 +0000
@@ -7,7 +7,10 @@
 		--template debian/autoload.php.tpl \
 		src
 	mkdir --parents vendor Laminas
-	ln -s ../src Laminas/Code
+	cp -r src Laminas/Code
+	ln -s /usr/share/php/Doctrine .
+	ln -s /usr/share/php/Laminas/EventManager Laminas
+	ln -s /usr/share/php/Laminas/Stdlib Laminas
 	phpab	--output vendor/autoload.php \
 		--template debian/autoload.tests.php.tpl \
 		test