diff -Nru php-cache-integration-tests-0.17.0/debian/autoload.php.tpl php-cache-integration-tests-0.17.0/debian/autoload.php.tpl
--- php-cache-integration-tests-0.17.0/debian/autoload.php.tpl	2021-06-01 11:47:17.000000000 +0000
+++ php-cache-integration-tests-0.17.0/debian/autoload.php.tpl	1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
-<?php
-
-// require_once 'Psr/Cache/autoload.php'; Already required by php-cache-tag-interop
-require_once 'Cache/TagInterop/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]) and file_exists(___BASEDIR___$classes[$cn])) {
-            require ___BASEDIR___$classes[$cn];
-        }
-    },
-    true,
-    false
-);
-// @codeCoverageIgnoreEnd
diff -Nru php-cache-integration-tests-0.17.0/debian/changelog php-cache-integration-tests-0.17.0/debian/changelog
--- php-cache-integration-tests-0.17.0/debian/changelog	2021-10-27 18:06:07.000000000 +0000
+++ php-cache-integration-tests-0.17.0/debian/changelog	2022-08-23 18:12:33.000000000 +0000
@@ -1,3 +1,24 @@
+php-cache-integration-tests (0.17.0-2ubuntu1) kinetic; urgency=medium
+
+  * Merge with Debian unstable (LP: #1987433). Remaining changes:
+    - d/p/remove-deps-from-require.patch: Add a patch to
+      remove deps from "require". Now that psr/cache v2
+      is released, we need to relax the constraints in
+      "require" so that tested libs can bump to v2 and
+      run tests with v2, which in a way is useless to do
+      since we're already doing it. Thus, this patch.
+
+ -- Bryce Harrington <bryce@canonical.com>  Tue, 23 Aug 2022 11:12:33 -0700
+
+php-cache-integration-tests (0.17.0-2) unstable; urgency=medium
+
+  * Fix d/watch after hosting change
+  * Use dh 13 and dh-sequence-phpcomposer instead of --with phpcomposer
+  * Generate phpabtpl at build time
+  * Update Standards-Version to 4.6.1
+
+ -- David Prévot <taffit@debian.org>  Sun, 10 Jul 2022 05:46:02 +0200
+
 php-cache-integration-tests (0.17.0-1ubuntu3) jammy; urgency=medium
 
   * No change rebuild for PHP 8.1
diff -Nru php-cache-integration-tests-0.17.0/debian/clean php-cache-integration-tests-0.17.0/debian/clean
--- php-cache-integration-tests-0.17.0/debian/clean	2021-06-01 11:47:17.000000000 +0000
+++ php-cache-integration-tests-0.17.0/debian/clean	2022-08-23 18:03:57.000000000 +0000
@@ -2,3 +2,4 @@
 Cache/
 src/autoload.php
 vendor/
+debian/autoload.php.tpl
diff -Nru php-cache-integration-tests-0.17.0/debian/control php-cache-integration-tests-0.17.0/debian/control
--- php-cache-integration-tests-0.17.0/debian/control	2021-06-01 11:58:54.000000000 +0000
+++ php-cache-integration-tests-0.17.0/debian/control	2022-08-23 18:12:33.000000000 +0000
@@ -4,10 +4,10 @@
 Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
 XSBC-Original-Maintainer: Debian PHP PEAR Maintainers <pkg-php-pear@lists.alioth.debian.org>
 Uploaders: David Prévot <taffit@debian.org>
-Build-Depends: debhelper-compat (= 13), phpab, pkg-php-tools
-Standards-Version: 4.5.1
+Build-Depends: debhelper-compat (= 13), dh-sequence-phpcomposer, phpab
+Standards-Version: 4.6.1
 Homepage: https://www.php-cache.com
-Vcs-Git: https://salsa.debian.org/php-team/pear/php-cache-integration-tests.git -b debian/latest
+Vcs-Git: https://salsa.debian.org/php-team/pear/php-cache-integration-tests.git
 Vcs-Browser: https://salsa.debian.org/php-team/pear/php-cache-integration-tests
 Rules-Requires-Root: no
 
diff -Nru php-cache-integration-tests-0.17.0/debian/rules php-cache-integration-tests-0.17.0/debian/rules
--- php-cache-integration-tests-0.17.0/debian/rules	2021-06-01 11:47:17.000000000 +0000
+++ php-cache-integration-tests-0.17.0/debian/rules	2022-08-23 18:03:57.000000000 +0000
@@ -1,8 +1,9 @@
 #!/usr/bin/make -f
 %:
-	dh $@  --with phpcomposer
+	dh $@
 
 execute_after_dh_auto_build:
+	phpabtpl composer.json > debian/autoload.php.tpl
 	phpab \
 		--output src/autoload.php \
 		--template debian/autoload.php.tpl \
diff -Nru php-cache-integration-tests-0.17.0/debian/watch php-cache-integration-tests-0.17.0/debian/watch
--- php-cache-integration-tests-0.17.0/debian/watch	2021-06-01 11:47:17.000000000 +0000
+++ php-cache-integration-tests-0.17.0/debian/watch	2022-08-23 18:03:57.000000000 +0000
@@ -1,4 +1,4 @@
 version=4
 options=uversionmangle=s/-?([^\d.])\.?/~$1/i;tr/A-Z/a-z/ \
 https://github.com/php-cache/integration-tests/releases \
-.*/archive/v?(\d.+).tar.gz
+.*/v?(\d.+).tar.gz