diff -Nru php-cache-integration-tests-0.16.0/debian/autoload.tests.php.tpl php-cache-integration-tests-0.16.0/debian/autoload.tests.php.tpl
--- php-cache-integration-tests-0.16.0/debian/autoload.tests.php.tpl	1970-01-01 00:00:00.000000000 +0000
+++ php-cache-integration-tests-0.16.0/debian/autoload.tests.php.tpl	2019-08-28 06:29:17.000000000 +0000
@@ -0,0 +1,25 @@
+<?php
+
+require_once 'Cache/IntegrationTests/autoload.php';
+require_once 'Stash/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-cache-integration-tests-0.16.0/debian/changelog php-cache-integration-tests-0.16.0/debian/changelog
--- php-cache-integration-tests-0.16.0/debian/changelog	2017-11-26 05:20:07.000000000 +0000
+++ php-cache-integration-tests-0.16.0/debian/changelog	2019-08-28 06:34:32.000000000 +0000
@@ -1,3 +1,16 @@
+php-cache-integration-tests (0.16.0-3) unstable; urgency=medium
+
+  * Extend d/clean for PHPUnit 8
+  * Compatibility with recent PHPUnit (8)
+  * Use versioned copyright format URI.
+  * Use secure URI in Homepage field.
+  * Bump debhelper from old 9 to 12.
+  * Move repository to salsa.d.o
+  * Drop get-orig-source target
+  * Update Standards-Version to 4.4.0
+
+ -- David Prévot <taffit@debian.org>  Tue, 27 Aug 2019 20:34:32 -1000
+
 php-cache-integration-tests (0.16.0-2) unstable; urgency=medium
 
   * Support recent PHPUnit
diff -Nru php-cache-integration-tests-0.16.0/debian/clean php-cache-integration-tests-0.16.0/debian/clean
--- php-cache-integration-tests-0.16.0/debian/clean	2017-09-17 05:47:20.000000000 +0000
+++ php-cache-integration-tests-0.16.0/debian/clean	2019-08-28 06:28:36.000000000 +0000
@@ -1 +1,4 @@
+.phpunit.result.cache
+Cache/
 src/autoload.php
+vendor/
diff -Nru php-cache-integration-tests-0.16.0/debian/compat php-cache-integration-tests-0.16.0/debian/compat
--- php-cache-integration-tests-0.16.0/debian/compat	2017-09-17 05:47:20.000000000 +0000
+++ php-cache-integration-tests-0.16.0/debian/compat	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-9
diff -Nru php-cache-integration-tests-0.16.0/debian/control php-cache-integration-tests-0.16.0/debian/control
--- php-cache-integration-tests-0.16.0/debian/control	2017-11-26 05:20:07.000000000 +0000
+++ php-cache-integration-tests-0.16.0/debian/control	2019-08-28 06:34:32.000000000 +0000
@@ -3,11 +3,11 @@
 Priority: optional
 Maintainer: Debian PHP PEAR Maintainers <pkg-php-pear@lists.alioth.debian.org>
 Uploaders: David Prévot <taffit@debian.org>
-Build-Depends: debhelper (>= 9), phpab, pkg-php-tools (>= 1.7~)
-Standards-Version: 4.1.1
-Homepage: http://www.php-cache.com
-Vcs-Git: git://anonscm.debian.org/pkg-php/php-cache-integration-tests.git
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-php/php-cache-integration-tests.git
+Build-Depends: debhelper-compat (= 12), phpab, pkg-php-tools (>= 1.7~)
+Standards-Version: 4.4.0
+Homepage: https://www.php-cache.com
+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
 
 Package: php-cache-integration-tests
 Architecture: all
diff -Nru php-cache-integration-tests-0.16.0/debian/copyright php-cache-integration-tests-0.16.0/debian/copyright
--- php-cache-integration-tests-0.16.0/debian/copyright	2017-09-17 20:42:45.000000000 +0000
+++ php-cache-integration-tests-0.16.0/debian/copyright	2019-08-28 06:29:17.000000000 +0000
@@ -1,4 +1,4 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: PSR-6 and PSR-16 Integration tests
 Upstream-Contact: Aaron Scherer <aequasi@gmail.com>
 Source: https://github.com/php-cache/integration-tests
diff -Nru php-cache-integration-tests-0.16.0/debian/patches/0002-Compatibility-with-recent-PHPUnit-8.patch php-cache-integration-tests-0.16.0/debian/patches/0002-Compatibility-with-recent-PHPUnit-8.patch
--- php-cache-integration-tests-0.16.0/debian/patches/0002-Compatibility-with-recent-PHPUnit-8.patch	1970-01-01 00:00:00.000000000 +0000
+++ php-cache-integration-tests-0.16.0/debian/patches/0002-Compatibility-with-recent-PHPUnit-8.patch	2019-08-28 06:28:36.000000000 +0000
@@ -0,0 +1,87 @@
+From: =?utf-8?q?David_Pr=C3=A9vot?= <taffit@debian.org>
+Date: Tue, 27 Aug 2019 18:55:09 -1000
+Subject: Compatibility with recent PHPUnit (8)
+
+---
+ src/CachePoolTest.php             | 4 ++--
+ src/HierarchicalCachePoolTest.php | 4 ++--
+ src/SimpleCacheTest.php           | 4 ++--
+ src/TaggableCachePoolTest.php     | 4 ++--
+ 4 files changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/src/CachePoolTest.php b/src/CachePoolTest.php
+index 926f14c..3b691ec 100644
+--- a/src/CachePoolTest.php
++++ b/src/CachePoolTest.php
+@@ -32,12 +32,12 @@ abstract class CachePoolTest extends TestCase
+      */
+     abstract public function createCachePool();
+ 
+-    protected function setUp()
++    protected function setUp(): void
+     {
+         $this->cache = $this->createCachePool();
+     }
+ 
+-    protected function tearDown()
++    protected function tearDown(): void
+     {
+         if ($this->cache !== null) {
+             $this->cache->clear();
+diff --git a/src/HierarchicalCachePoolTest.php b/src/HierarchicalCachePoolTest.php
+index 768d120..8e3519f 100644
+--- a/src/HierarchicalCachePoolTest.php
++++ b/src/HierarchicalCachePoolTest.php
+@@ -34,12 +34,12 @@ abstract class HierarchicalCachePoolTest extends TestCase
+      */
+     abstract public function createCachePool();
+ 
+-    protected function setUp()
++    protected function setUp(): void
+     {
+         $this->cache = $this->createCachePool();
+     }
+ 
+-    protected function tearDown()
++    protected function tearDown(): void
+     {
+         if ($this->cache !== null) {
+             $this->cache->clear();
+diff --git a/src/SimpleCacheTest.php b/src/SimpleCacheTest.php
+index 42d1200..4f7c6b1 100644
+--- a/src/SimpleCacheTest.php
++++ b/src/SimpleCacheTest.php
+@@ -31,12 +31,12 @@ abstract class SimpleCacheTest extends TestCase
+      */
+     abstract public function createSimpleCache();
+ 
+-    protected function setUp()
++    protected function setUp(): void
+     {
+         $this->cache = $this->createSimpleCache();
+     }
+ 
+-    protected function tearDown()
++    protected function tearDown(): void
+     {
+         if ($this->cache !== null) {
+             $this->cache->clear();
+diff --git a/src/TaggableCachePoolTest.php b/src/TaggableCachePoolTest.php
+index 763b775..a0c7474 100644
+--- a/src/TaggableCachePoolTest.php
++++ b/src/TaggableCachePoolTest.php
+@@ -34,12 +34,12 @@ abstract class TaggableCachePoolTest extends TestCase
+      */
+     abstract public function createCachePool();
+ 
+-    protected function setUp()
++    protected function setUp(): void
+     {
+         $this->cache = $this->createCachePool();
+     }
+ 
+-    protected function tearDown()
++    protected function tearDown(): void
+     {
+         if ($this->cache !== null) {
+             $this->cache->clear();
diff -Nru php-cache-integration-tests-0.16.0/debian/patches/series php-cache-integration-tests-0.16.0/debian/patches/series
--- php-cache-integration-tests-0.16.0/debian/patches/series	2017-11-26 05:20:07.000000000 +0000
+++ php-cache-integration-tests-0.16.0/debian/patches/series	2019-08-28 06:28:36.000000000 +0000
@@ -1 +1,2 @@
 0001-Move-to-namespaced-phpunit-versions.patch
+0002-Compatibility-with-recent-PHPUnit-8.patch
diff -Nru php-cache-integration-tests-0.16.0/debian/rules php-cache-integration-tests-0.16.0/debian/rules
--- php-cache-integration-tests-0.16.0/debian/rules	2017-11-26 05:20:07.000000000 +0000
+++ php-cache-integration-tests-0.16.0/debian/rules	2019-08-28 06:33:34.000000000 +0000
@@ -11,6 +11,3 @@
 
 override_dh_installchangelogs:
 	dh_installchangelogs debian/upstream/changelog
-
-get-orig-source:
-	uscan --force --verbose --rename