diff -Nru php-sql-formatter-1.2.17/debian/changelog php-sql-formatter-1.2.17/debian/changelog
--- php-sql-formatter-1.2.17/debian/changelog	2016-03-03 01:56:13.000000000 +0000
+++ php-sql-formatter-1.2.17/debian/changelog	2018-03-08 21:22:49.000000000 +0000
@@ -1,3 +1,16 @@
+php-sql-formatter (1.2.17-3) unstable; urgency=medium
+
+  [ Chris Lamb ]
+  * Fix dh_installchangelogs call (Closes: #831777)
+
+  [ David Prévot ]
+  * Move to namespaced phpunit versions (Closes: #882918)
+  * Move project repository to salsa.d.o
+  * Update Standards-Version to 4.1.3
+  * Use more HTTPS to please lintian
+
+ -- David Prévot <taffit@debian.org>  Thu, 08 Mar 2018 11:22:49 -1000
+
 php-sql-formatter (1.2.17-2) unstable; urgency=medium
 
   * Provide homemade static autoload.php
diff -Nru php-sql-formatter-1.2.17/debian/control php-sql-formatter-1.2.17/debian/control
--- php-sql-formatter-1.2.17/debian/control	2016-03-03 01:48:54.000000000 +0000
+++ php-sql-formatter-1.2.17/debian/control	2018-03-08 21:22:46.000000000 +0000
@@ -4,10 +4,10 @@
 Maintainer: Debian PHP PEAR Maintainers <pkg-php-pear@lists.alioth.debian.org>
 Uploaders: David Prévot <taffit@debian.org>
 Build-Depends: debhelper (>= 9), phpab, phpunit, pkg-php-tools (>= 1.7~)
-Standards-Version: 3.9.7
+Standards-Version: 4.1.3
 Homepage: https://github.com/jdorn/sql-formatter
-Vcs-Git: git://anonscm.debian.org/pkg-php/php-sql-formatter.git
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-php/php-sql-formatter.git
+Vcs-Git: https://salsa.debian.org/php-team/pear/php-sql-formatter.git
+Vcs-Browser: https://salsa.debian.org/php-team/pear/php-sql-formatter
 
 Package: php-sql-formatter
 Architecture: all
diff -Nru php-sql-formatter-1.2.17/debian/copyright php-sql-formatter-1.2.17/debian/copyright
--- php-sql-formatter-1.2.17/debian/copyright	2016-03-03 01:37:47.000000000 +0000
+++ php-sql-formatter-1.2.17/debian/copyright	2018-03-08 21:22:46.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: SqlFormatter
 Source: https://github.com/jdorn/sql-formatter
 Upstream-Contact: Jeremy Dorn <jeremy@jeremydorn.com>
diff -Nru php-sql-formatter-1.2.17/debian/patches/0002-Move-to-namespaced-phpunit-versions.patch php-sql-formatter-1.2.17/debian/patches/0002-Move-to-namespaced-phpunit-versions.patch
--- php-sql-formatter-1.2.17/debian/patches/0002-Move-to-namespaced-phpunit-versions.patch	1970-01-01 00:00:00.000000000 +0000
+++ php-sql-formatter-1.2.17/debian/patches/0002-Move-to-namespaced-phpunit-versions.patch	2018-03-08 21:22:46.000000000 +0000
@@ -0,0 +1,39 @@
+From: =?utf-8?q?David_Pr=C3=A9vot?= <david@tilapin.org>
+Date: Thu, 8 Mar 2018 10:58:24 -1000
+Subject: Move to namespaced phpunit versions
+
+Debian-Bug: https://bugs.debian.org/882918
+Forwarded: https://github.com/jdorn/sql-formatter/pull/102
+---
+ composer.json              | 2 +-
+ tests/SqlFormatterTest.php | 4 +++-
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/composer.json b/composer.json
+index 0f29a05..0e77949 100644
+--- a/composer.json
++++ b/composer.json
+@@ -10,7 +10,7 @@
+         "php": ">=5.2.4"
+     },
+     "require-dev": {
+-        "phpunit/phpunit": "3.7.*"
++        "phpunit/phpunit": "> 5.4.3"
+     },
+     "authors": [
+         {
+diff --git a/tests/SqlFormatterTest.php b/tests/SqlFormatterTest.php
+index ac3a232..d66883e 100644
+--- a/tests/SqlFormatterTest.php
++++ b/tests/SqlFormatterTest.php
+@@ -4,7 +4,9 @@ require 'SqlFormatter/autoload.php';
+ // Force SqlFormatter to run in non-CLI mode for tests
+ SqlFormatter::$cli = false;
+ 
+-class SqlFormatterTest extends PHPUnit_Framework_TestCase {
++use PHPUnit\Framework\TestCase;
++
++class SqlFormatterTest extends TestCase {
+ 	protected $sqlData;
+ 	
+ 	/**
diff -Nru php-sql-formatter-1.2.17/debian/patches/series php-sql-formatter-1.2.17/debian/patches/series
--- php-sql-formatter-1.2.17/debian/patches/series	2016-03-03 01:48:43.000000000 +0000
+++ php-sql-formatter-1.2.17/debian/patches/series	2018-03-08 21:22:46.000000000 +0000
@@ -1 +1,2 @@
 0001-Use-homemade-static-autoload-in-examples-and-tests.patch
+0002-Move-to-namespaced-phpunit-versions.patch
diff -Nru php-sql-formatter-1.2.17/debian/rules php-sql-formatter-1.2.17/debian/rules
--- php-sql-formatter-1.2.17/debian/rules	2016-03-03 01:48:43.000000000 +0000
+++ php-sql-formatter-1.2.17/debian/rules	2018-03-08 21:10:34.000000000 +0000
@@ -16,8 +16,8 @@
 	echo "** tests disabled"
 endif
 
-override_dh_install_changelogs:
-	dh_install_changelogs debian/upstream/changelog
+override_dh_installchangelogs:
+	dh_installchangelogs debian/upstream/changelog
 
 get-orig-source:
 	uscan --verbose --force --rename