diff -Nru php-arthurhoaro-web-thumbnailer-2.1.0+dfsg/debian/autoloaders/php-arthurhoaro-web-thumbnailer php-arthurhoaro-web-thumbnailer-2.1.0+dfsg/debian/autoloaders/php-arthurhoaro-web-thumbnailer
--- php-arthurhoaro-web-thumbnailer-2.1.0+dfsg/debian/autoloaders/php-arthurhoaro-web-thumbnailer	1970-01-01 00:00:00.000000000 +0000
+++ php-arthurhoaro-web-thumbnailer-2.1.0+dfsg/debian/autoloaders/php-arthurhoaro-web-thumbnailer	2022-12-12 19:58:17.000000000 +0000
@@ -0,0 +1 @@
+arthurhoaro web-thumbnailer WebThumbnailer/autoload.php
diff -Nru php-arthurhoaro-web-thumbnailer-2.1.0+dfsg/debian/autoload.test.php.tpl php-arthurhoaro-web-thumbnailer-2.1.0+dfsg/debian/autoload.test.php.tpl
--- php-arthurhoaro-web-thumbnailer-2.1.0+dfsg/debian/autoload.test.php.tpl	2022-09-09 15:54:14.000000000 +0000
+++ php-arthurhoaro-web-thumbnailer-2.1.0+dfsg/debian/autoload.test.php.tpl	1970-01-01 00:00:00.000000000 +0000
@@ -1,24 +0,0 @@
-<?php
-
-require_once 'WebThumbnailer/autoload.php';
-
-// @codingStandardsIgnoreFile
-// @codeCoverageIgnoreStart
-// this is an autogenerated file - do not edit
-spl_autoload_register(
-    function($class) {
-        static $classes = null;
-        if ($classes === null) {
-            $classes = array(
-                ___CLASSLIST___
-            );
-        }
-        $cn = strtolower($class);
-        if (isset($classes[$cn])) {
-            require ___BASEDIR___$classes[$cn];
-        }
-    },
-    true,
-    false
-);
-// @codeCoverageIgnoreEnd
diff -Nru php-arthurhoaro-web-thumbnailer-2.1.0+dfsg/debian/changelog php-arthurhoaro-web-thumbnailer-2.1.0+dfsg/debian/changelog
--- php-arthurhoaro-web-thumbnailer-2.1.0+dfsg/debian/changelog	2022-09-09 15:54:14.000000000 +0000
+++ php-arthurhoaro-web-thumbnailer-2.1.0+dfsg/debian/changelog	2022-12-12 19:58:17.000000000 +0000
@@ -1,3 +1,11 @@
+php-arthurhoaro-web-thumbnailer (2.1.0+dfsg-2) unstable; urgency=medium
+
+  * Generate phpabtpl at build time
+    - Use template to ensure dependencies are included.
+    - Move autopkgtest command to script.
+
+ -- James Valleroy <jvalleroy@mailbox.org>  Mon, 12 Dec 2022 14:58:17 -0500
+
 php-arthurhoaro-web-thumbnailer (2.1.0+dfsg-1) unstable; urgency=medium
 
   * New upstream version 2.1.0+dfsg
diff -Nru php-arthurhoaro-web-thumbnailer-2.1.0+dfsg/debian/clean php-arthurhoaro-web-thumbnailer-2.1.0+dfsg/debian/clean
--- php-arthurhoaro-web-thumbnailer-2.1.0+dfsg/debian/clean	2022-09-09 15:54:14.000000000 +0000
+++ php-arthurhoaro-web-thumbnailer-2.1.0+dfsg/debian/clean	2022-12-12 19:58:17.000000000 +0000
@@ -1,3 +1,5 @@
+debian/autoload.php.tpl
+debian/autoload.tests.php.tpl
 src/autoload.php
 vendor/
 WebThumbnailer
diff -Nru php-arthurhoaro-web-thumbnailer-2.1.0+dfsg/debian/control php-arthurhoaro-web-thumbnailer-2.1.0+dfsg/debian/control
--- php-arthurhoaro-web-thumbnailer-2.1.0+dfsg/debian/control	2022-09-09 15:54:14.000000000 +0000
+++ php-arthurhoaro-web-thumbnailer-2.1.0+dfsg/debian/control	2022-12-12 19:58:17.000000000 +0000
@@ -8,7 +8,7 @@
                php-gd,
                phpab,
                phpunit,
-               pkg-php-tools
+               pkg-php-tools (>= 1.41~)
 Standards-Version: 4.6.1
 Homepage: https://github.com/ArthurHoaro/web-thumbnailer
 Vcs-Browser: https://salsa.debian.org/php-team/pear/php-arthurhoaro-web-thumbnailer
@@ -17,7 +17,10 @@
 
 Package: php-arthurhoaro-web-thumbnailer
 Architecture: all
-Depends: php-curl, php-gd, ${misc:Depends}, ${phpcomposer:Debian-require}
+Depends: php-curl,
+         php-gd,
+         ${misc:Depends},
+         ${phpcomposer:Debian-require}
 Recommends: ${phpcomposer:Debian-recommend}
 Suggests: ${phpcomposer:Debian-suggest}
 Description: ${phpcomposer:description}
diff -Nru php-arthurhoaro-web-thumbnailer-2.1.0+dfsg/debian/install php-arthurhoaro-web-thumbnailer-2.1.0+dfsg/debian/install
--- php-arthurhoaro-web-thumbnailer-2.1.0+dfsg/debian/install	2022-09-09 15:54:14.000000000 +0000
+++ php-arthurhoaro-web-thumbnailer-2.1.0+dfsg/debian/install	2022-12-12 19:58:17.000000000 +0000
@@ -1 +1,2 @@
-src/* usr/share/php/WebThumbnailer
+debian/autoloaders	usr/share/pkg-php-tools
+src/*			usr/share/php/WebThumbnailer
diff -Nru php-arthurhoaro-web-thumbnailer-2.1.0+dfsg/debian/pkg-php-tools-autoloaders php-arthurhoaro-web-thumbnailer-2.1.0+dfsg/debian/pkg-php-tools-autoloaders
--- php-arthurhoaro-web-thumbnailer-2.1.0+dfsg/debian/pkg-php-tools-autoloaders	1970-01-01 00:00:00.000000000 +0000
+++ php-arthurhoaro-web-thumbnailer-2.1.0+dfsg/debian/pkg-php-tools-autoloaders	2022-12-12 19:58:17.000000000 +0000
@@ -0,0 +1 @@
+arthurhoaro	web-thumbnailer		WebThumbnailer/autoload.php
diff -Nru php-arthurhoaro-web-thumbnailer-2.1.0+dfsg/debian/rules php-arthurhoaro-web-thumbnailer-2.1.0+dfsg/debian/rules
--- php-arthurhoaro-web-thumbnailer-2.1.0+dfsg/debian/rules	2022-09-09 15:54:14.000000000 +0000
+++ php-arthurhoaro-web-thumbnailer-2.1.0+dfsg/debian/rules	2022-12-12 19:58:17.000000000 +0000
@@ -5,14 +5,21 @@
 	dh $@ --with phpcomposer
 
 override_dh_auto_build:
-	phpab --output src/autoload.php src
+	phpabtpl composer.json > debian/autoload.php.tpl
+	phpab \
+		--output src/autoload.php \
+		--template debian/autoload.php.tpl \
+		src
 	# Workaround to ensure the local class takes precedence during tests.
 	ln -s src WebThumbnailer
 	# Build classloader for tests
 	mkdir --parents vendor
+	phpabtpl \
+		--require arthurhoaro/web-thumbnailer \
+		> debian/autoload.tests.php.tpl
 	phpab \
 		--output vendor/autoload.php \
-		--template debian/autoload.test.php.tpl \
+		--template debian/autoload.tests.php.tpl \
 		tests
 
 override_dh_auto_test:
diff -Nru php-arthurhoaro-web-thumbnailer-2.1.0+dfsg/debian/tests/control php-arthurhoaro-web-thumbnailer-2.1.0+dfsg/debian/tests/control
--- php-arthurhoaro-web-thumbnailer-2.1.0+dfsg/debian/tests/control	2022-09-09 15:54:14.000000000 +0000
+++ php-arthurhoaro-web-thumbnailer-2.1.0+dfsg/debian/tests/control	2022-12-12 19:58:17.000000000 +0000
@@ -1,2 +1,8 @@
-Test-Command: mkdir --parents vendor && phpab --output vendor/autoload.php --template debian/autoload.test.php.tpl tests && phpunit --do-not-cache-result --no-coverage
-Depends: ca-certificates, php-gd, phpab, phpunit, @
+Tests: phpunit
+Restrictions: allow-stderr
+Depends: ca-certificates,
+         php-gd,
+         phpab,
+         phpunit,
+         pkg-php-tools (>= 1.41~),
+         @
diff -Nru php-arthurhoaro-web-thumbnailer-2.1.0+dfsg/debian/tests/phpunit php-arthurhoaro-web-thumbnailer-2.1.0+dfsg/debian/tests/phpunit
--- php-arthurhoaro-web-thumbnailer-2.1.0+dfsg/debian/tests/phpunit	1970-01-01 00:00:00.000000000 +0000
+++ php-arthurhoaro-web-thumbnailer-2.1.0+dfsg/debian/tests/phpunit	2022-12-12 19:58:17.000000000 +0000
@@ -0,0 +1,10 @@
+#!/bin/sh
+mkdir --parents vendor
+phpabtpl \
+    --require arthurhoaro/web-thumbnailer \
+    > debian/autoload.tests.php.tpl
+phpab \
+    --output vendor/autoload.php \
+    --template debian/autoload.tests.php.tpl \
+    tests
+phpunit --do-not-cache-result --no-coverage