Merge version 18.06.1+dfsg1-2+rpi1 and 18.09.1+dfsg1-7 to produce 18.09.1+dfsg1-7...

diff --cc debian/changelog
index 3b693c1855732e471b2062c4ce3aa2c9122ea387,e4146eada54a88ccca99e8435d7cbf95099dec2a..dd65ca12746c41530ee7188025a2a02411283411
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,73 +1,80 @@@
- docker.io (18.06.1+dfsg1-2+rpi1) buster-staging; urgency=medium
++docker.io (18.09.1+dfsg1-7+rpi1) buster-staging; urgency=medium
 +
++  [changes brought forward from 18.06.1+dfsg1-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sat, 26 Jan 2019 01:54:38 +0000]
 +  * Disable testsuite.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Sat, 26 Jan 2019 01:54:38 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Tue, 18 Jun 2019 15:50:08 +0000
++
+ docker.io (18.09.1+dfsg1-7) unstable; urgency=medium
+ 
+   * Add patch to revert using iptables-legacy (Closes: #921600).
+ 
+  -- Arnaud Rebillout <arnaud.rebillout@collabora.com>  Mon, 13 May 2019 09:34:45 +0700
+ 
+ docker.io (18.09.1+dfsg1-6) unstable; urgency=medium
+ 
+   * Add patch to fix Debian security presence check (Closes: #925224).
+ 
+  -- Arnaud Rebillout <arnaud.rebillout@collabora.com>  Tue, 16 Apr 2019 09:56:17 +0700
+ 
+ docker.io (18.09.1+dfsg1-5) unstable; urgency=medium
+ 
+   * Install "containerd-shim" as "docker-containerd-shim" (Closes: #920935).
+   * Update containerd-name patch.
+ 
+  -- Arnaud Rebillout <arnaud.rebillout@collabora.com>  Sat, 02 Feb 2019 10:00:35 +1100
+ 
+ docker.io (18.09.1+dfsg1-4) unstable; urgency=medium
+ 
+   * Updated "containerd" executable name patch;
+     renamed "containerd-shim" executable (Closes: #920597).
+ 
+  -- Dmitry Smirnov <onlyjob@debian.org>  Mon, 28 Jan 2019 10:16:28 +1100
+ 
+ docker.io (18.09.1+dfsg1-3) unstable; urgency=medium
+ 
+   * New patch to fix name of the "containerd" executable (Closes: #920597).
+ 
+  -- Dmitry Smirnov <onlyjob@debian.org>  Sun, 27 Jan 2019 23:43:53 +1100
+ 
+ docker.io (18.09.1+dfsg1-2) unstable; urgency=medium
+ 
+   [ Dmitry Smirnov ]
+   * Standards-Version: 4.3.0.
+   * Upload to unstable.
+ 
+   [ Arnaud Rebillout ]
+   * Bump runc requirement to 1.0.0~rc6.
+   * Add patch to skip flaky test.
+   * Tidy up patches.
+ 
+  -- Arnaud Rebillout <arnaud.rebillout@collabora.com>  Sat, 26 Jan 2019 10:58:39 +1100
+ 
+ docker.io (18.09.1+dfsg1-1) experimental; urgency=medium
+ 
+   * New upstream release [January 2019].
+   * Remove obsolete patches, refresh remaining ones.
+   * New notable patches:
+     - build against the runc debian package.
+     - build against google-grpc 1.11.
+     - attempt to fix mips build.
+     - disable a test file that fails to build (known issue upstream).
+   * Remove various build dependencies, add new ones.
+   * Bump some build dependencies:
+     - golang-github-coreos-bbolt-dev (>= 1.3.1-coreos.5-3~).
+   * Vendor some build dependencies:
+     - docker/licensing (no debian package, no upstream release).
+     - golang-github-spf13-cobra/pflag-dev (docker has internal fork).
+ 
+  -- Arnaud Rebillout <arnaud.rebillout@collabora.com>  Tue, 22 Jan 2019 19:48:15 +1100
+ 
+ docker.io (18.06.1+dfsg1-3) unstable; urgency=medium
+ 
+   * Import upstream patch to use iptables-legacy (Closes: #911808).
+   * Un-vendor opencontainers-runtime-tools.
+   * Import numerous patches from upstream for go 1.11.
+ 
+  -- Arnaud Rebillout <arnaud.rebillout@collabora.com>  Thu, 17 Jan 2019 15:37:54 +1100
  
  docker.io (18.06.1+dfsg1-2) unstable; urgency=medium