Merge version 18.09.9+dfsg1-5+rpi1 and 19.03.4+dfsg2-2 to produce 19.03.4+dfsg2-2...

diff --cc debian/changelog
index e067e3caf8131a3655ef81ce0d4262a7d2135971,252e09d6aeca41fab3d66d237a9f24e32ff6086d..1f454b3e7101741c997f448936f5ad55304da25f
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,88 +1,95 @@@
- docker.io (18.09.9+dfsg1-5+rpi1) bullseye-staging; urgency=medium
++docker.io (19.03.4+dfsg2-2+rpi1) bullseye-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>  Tue, 15 Oct 2019 13:21:57 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sun, 24 Nov 2019 21:33:26 +0000
++
+ docker.io (19.03.4+dfsg2-2) unstable; urgency=medium
+ 
+   * Removed unused package from Build-Depends.
+   * Standards-Version: 4.4.1.
+ 
+  -- Dmitry Smirnov <onlyjob@debian.org>  Tue, 12 Nov 2019 12:18:22 +1100
+ 
+ docker.io (19.03.4+dfsg2-1) unstable; urgency=medium
+ 
+   * Bump dfsg version to update orig tarball in the pool.
+ 
+  -- Arnaud Rebillout <arnaud.rebillout@collabora.com>  Mon, 04 Nov 2019 16:06:27 +0700
+ 
+ docker.io (19.03.4+dfsg1-3) unstable; urgency=medium
+ 
+   [ Dmitry Smirnov ]
+   * get-orig-source.sh: minor shellcheck correction.
+   * get-orig-source.sh: consistent/reproducible tarball generation.
+   * dev: install "libnetwork/ipvs", as required by Kubernetes.
+   * drop "github.com/marstr/guid" (indirect dependency).
+   * Un-vendor "golang-github-graylog2-go-gelf-dev".
+ 
+   [ Arnaud Rebillout ]
+   * Stop vendoring docker-go-metrics.
+   * Add a patch to fix reverse build-deps against docker/cli.
+ 
+   [ Dmitry Smirnov ]
+   * tighten build-dep
+   * disabled unreliable test "TestClientWithRequestTimeout".
+ 
+  -- Arnaud Rebillout <arnaud.rebillout@collabora.com>  Mon, 04 Nov 2019 14:26:10 +0700
+ 
+ docker.io (19.03.4+dfsg1-2) experimental; urgency=medium
+ 
+   [ Arnaud Rebillout ]
+   * Add patch to fix build against prometheus-client-golang 1.2.1-1
+ 
+   [ Dmitry Smirnov ]
+   * dev to depend on "golang-github-morikuni-aec-dev" (used in
+     "pkg/jsonmessage").
+   * dev: provide "containerd/labels".
+ 
+  -- Arnaud Rebillout <arnaud.rebillout@collabora.com>  Wed, 30 Oct 2019 12:19:58 +0700
+ 
+ docker.io (19.03.4+dfsg1-1) experimental; urgency=medium
+ 
+   * New upstream release [19.03.4].
+   * Unvendor a few build dependencies.
+   * Drop golang-docker-dev transitional package.
+ 
+  -- Arnaud Rebillout <arnaud.rebillout@collabora.com>  Sat, 26 Oct 2019 10:39:45 +0700
+ 
+ docker.io (19.03.3+dfsg1-1) experimental; urgency=medium
+ 
+   * New upstream release [19.03.3].
+   * Drop & refresh patches.
+   * Update build dependencies.
+   * Vendor every dependencies that are missing/outdated in debian.
+   * Cherry-pick changes from master (18.09.9+dfsg1-4 to 18.09.9+dfsg2-6).
+ 
+  -- Arnaud Rebillout <arnaud.rebillout@collabora.com>  Mon, 21 Oct 2019 11:06:43 +0700
+ 
+ docker.io (18.09.9+dfsg2-7) unstable; urgency=medium
+ 
+   [ Arnaud Rebillout ]
+   * Add patch to fix build against prometheus-client-golang 1.2.1-1
+ 
+   [ Dmitry Smirnov ]
+   * get-orig-source.sh: consistent/reproducible tarball generation.
+   * dev/install:
+     + containerd/labels
+     + libnetwork/ipvs
+ 
+  -- Dmitry Smirnov <onlyjob@debian.org>  Thu, 31 Oct 2019 19:22:25 +1100
+ 
+ docker.io (18.09.9+dfsg2-6) unstable; urgency=medium
+ 
+   * (Build-)Depends:
+     + golang-github-appc-cni-dev (>= 0.7.1~)
+     + golang-github-containerd-go-cni-dev (>= 0.0~git20190904~)
+     + golang-github-containernetworking-plugins-dev
+     + golang-github-morikuni-aec-dev
+   * dev: provide few more containerd components.
+ 
+  -- Dmitry Smirnov <onlyjob@debian.org>  Fri, 18 Oct 2019 00:05:06 +1100
  
  docker.io (18.09.9+dfsg1-5) unstable; urgency=medium
  

diff --cc debian/rules
Simple merge