diff -Nru adacgi-1.6/debian/changelog adacgi-1.6/debian/changelog
--- adacgi-1.6/debian/changelog	2017-09-05 18:20:01.000000000 +0000
+++ adacgi-1.6/debian/changelog	2018-10-21 14:06:34.000000000 +0000
@@ -1,3 +1,23 @@
+adacgi (1.6-22) unstable; urgency=medium
+
+  * Re-upload to carry changes from experimental to unstable (for
+    GNAT-8 transition).  Closes: #903843.
+
+ -- Phil Brooke <pjb@debian.org>  Sun, 21 Oct 2018 15:06:34 +0100
+
+adacgi (1.6-21) experimental; urgency=medium
+
+  * Apply the following changes from Nicolas Boulenguez.  Thank you!
+    - Rebuild with gcc-8, rename -dev and lib packages accordingly.
+    - Update dependencies: debhelper.
+    - Standards-Version: 4.1.5. Rules-Requires-Root: no.
+    - Make test more verbose to help investigation in case of failure.
+    - Delete trailing spaces in changelog.
+    - Drop obsolete version requirement on dpkg-dev.
+    - Simplify parsing of debian/control.
+
+ -- Phil Brooke <pjb@debian.org>  Sat, 21 Jul 2018 16:22:57 +0100
+
 adacgi (1.6-20) unstable; urgency=medium
 
   * Ack NMUs 1.6-19.1 and 1.6-19.2.  Thank you, Nicolas.
@@ -86,22 +106,22 @@
 adacgi (1.6-12) unstable; urgency=low
 
   * Bump gnat version to 4.4.
-  * Change architecture to any (to match gnat-4.4). 
+  * Change architecture to any (to match gnat-4.4).
     (Closes: #568431, #542408).
-  * Bump standards version to 3.8.4.	
+  * Bump standards version to 3.8.4.
 
  -- Phil Brooke <pjb@debian.org>  Sat, 06 Feb 2010 15:26:08 +0000
 
 adacgi (1.6-11) unstable; urgency=low
 
-  * Bump debian/compat to 6 and build-depends on debhelper.     
+  * Bump debian/compat to 6 and build-depends on debhelper.
   * Bump standards version to 3.8.2.
 
  -- Phil Brooke <pjb@debian.org>  Wed, 24 Jun 2009 09:01:08 +0100
 
 adacgi (1.6-10) unstable; urgency=low
 
-  * Bump gnat version to 4.3. 
+  * Bump gnat version to 4.3.
   * Add mips and mipsel architectures.
   * Fix debian/compat.
   * Fix copyright file.
@@ -219,4 +239,3 @@
   * Initial Debian version.
 
  -- Samuel Tardieu <sam@debian.org>  Fri, 22 Oct 1999 20:25:34 +0200
-
diff -Nru adacgi-1.6/debian/compat adacgi-1.6/debian/compat
--- adacgi-1.6/debian/compat	2017-07-28 13:15:03.000000000 +0000
+++ adacgi-1.6/debian/compat	2018-07-21 15:19:47.000000000 +0000
@@ -1 +1 @@
-10
+11
diff -Nru adacgi-1.6/debian/control adacgi-1.6/debian/control
--- adacgi-1.6/debian/control	2017-07-29 13:36:38.000000000 +0000
+++ adacgi-1.6/debian/control	2018-07-21 15:19:47.000000000 +0000
@@ -2,17 +2,17 @@
 Maintainer: Phil Brooke <pjb@debian.org>
 Section: libdevel
 Priority: optional
-Standards-Version: 4.0.0
-Build-Depends: debhelper (>= 10),
- gnat, gnat-7,
+Standards-Version: 4.1.5
+Rules-Requires-Root: no
+Build-Depends:
+ debhelper (>= 11),
+ gnat, gnat-8,
 # This line is parsed by debian/rules.
- dpkg-dev (>= 1.16.1),
-# /usr/share/dpkg/default.mk
  dh-ada-library,
  gprbuild
 Homepage: http://www.dwheeler.com/adacgi
 
-Package: libadacgi1-dev
+Package: libadacgi2-dev
 Architecture: any
 Depends: ${misc:Depends}, ${ada:Depends}
 Description: Ada CGI interface: development
@@ -22,7 +22,7 @@
  .
  Install this package if you want to write programs that use AdaCGI.
 
-Package: libadacgi1
+Package: libadacgi2
 Section: libs
 Architecture: any
 Multi-Arch: same
diff -Nru adacgi-1.6/debian/rules adacgi-1.6/debian/rules
--- adacgi-1.6/debian/rules	2017-07-29 13:39:45.000000000 +0000
+++ adacgi-1.6/debian/rules	2018-07-21 15:19:47.000000000 +0000
@@ -5,11 +5,7 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-define new_line :=
-
-
-endef
-$(eval $(addsuffix $(new_line),$(shell sed -n '\
+$(foreach line,$(shell sed -n '\
   s/^ gnat, gnat-\([0-9.]\+\),$$/ \
     GNAT_VERSION:=\1 \
   /p;\
@@ -19,7 +15,7 @@
   s/^Package: \(libadacgi[0-9.]\+-dev\)$$/ \
     DEV_PKG:=\1 \
   /p;\
-  ' debian/control)))
+  ' debian/control),$(eval $(line)))
 
 DEB_BUILD_MAINT_OPTIONS := hardening=+all
 include /usr/share/dpkg/buildflags.mk
diff -Nru adacgi-1.6/debian/tests/link-with-shared adacgi-1.6/debian/tests/link-with-shared
--- adacgi-1.6/debian/tests/link-with-shared	2016-08-29 17:09:44.000000000 +0000
+++ adacgi-1.6/debian/tests/link-with-shared	2018-07-21 15:19:47.000000000 +0000
@@ -3,5 +3,5 @@
 
 DEV_PKG=`sed -nr '/^Package: (libadacgi.*-dev)$$/{s//\1/p;q}' debian/control`
 cp -a /usr/share/doc/$DEV_PKG/examples "$ADTTMP"
-gprbuild "$ADTTMP/examples/examples.gpr"
+gprbuild -v "$ADTTMP/examples/examples.gpr"
 "$ADTTMP/examples/minimal"