Manual merge of version 2.30-5+rpi1 and 2.37-3 to produce 2.37-3+rpi1

diff --cc debian/changelog
index e9ad6f37e74279e8263c14f27e768efd4367d58a,f2d6f7c7b2f7a7781de24f5302ae357b8fe6c4b5..930f7c8482bfae0f2571171638382eff24fdded3
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,41 +1,50 @@@
- conflicts found
- debian/rules
- snapd (2.30-5+rpi1) buster-staging; urgency=medium
++snapd (2.37-3+rpi1) buster-staging; urgency=medium
 +
 +  [changes brought forward from 2.27.2-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 24 Aug 2017 17:53:18 +0000]
 +  * Treat unknown derivatives the same as Debian.
 +  * Disable testsuite.
 +  * Fix clean target.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Sat, 17 Feb 2018 10:25:46 +0000
++ -- Peter Michael Green <plugwash@raspbian.org>  Thu, 31 Jan 2019 15:32:21 +0000
++
+ snapd (2.37-3) unstable; urgency=medium
+ 
+   * Fix --no-arch-any build.
+ 
+  -- Michael Hudson-Doyle <mwhudson@debian.org>  Thu, 24 Jan 2019 16:11:17 +1300
+ 
+ snapd (2.37-2) unstable; urgency=medium
+ 
+   * d/patches/0010-man-page-sections.patch: fix a couple of instances of the
+     lintian warning 'manpage-section-mismatch'.
+ 
+  -- Michael Hudson-Doyle <mwhudson@debian.org>  Thu, 24 Jan 2019 09:52:09 +1300
+ 
+ snapd (2.37-1) unstable; urgency=medium
+ 
+   [ Michael Hudson-Doyle ]
+   * New upstream version.
+   * d/control: make myself Maintainer, use my Debian address, update Vcs-* to
+     point to salsa.
+   * Add new build-dependencies.
+   * d/watch: update to download new upstream-provided no-vendor tarballs.
+   * d/patches: refresh/drop.
+   * d/patches/no-snapfuse.patch: do not depend on snapfuse fork of squashfuse.
+   * d/patches/upstram-bolt.patch: use upstream version of boltdb.
+   * d/patches/systemd-activation-compat.patch: compatibility for the
+     newer go-systemd in debian
+ 
+   [ Ondřej Nový ]
+   * d/copyright: Use https protocol in Format field
+   * d/changelog: Remove trailing whitespaces
+ 
+   [ Zygmunt Krynicki ]
+   * Update unreleased package to 2.37
+   * Drop and recreate all patches
+   * Add patches for failing unit tests
+   * Reconcile packaging with snapd upstream
+ 
+  -- Zygmunt Krynicki <me@zygoon.pl>  Tue, 22 Jan 2019 12:39:58 +0100
  
  snapd (2.30-5) unstable; urgency=medium
  

diff --cc debian/rules
index b2acb55695b8d75411fe7a77ec716cf94d0b4950,7a1cb90a253940ed41177b4ce113093343ec7354..01729d01facd5c5270cad5d0d3dd483dd8aed21f
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -70,13 -85,20 +85,16 @@@ ifeq ($(shell dpkg-vendor --query Vendo
      # for stability, predicability and easy of deployment. We need to link some
      # things dynamically though: udev has no stable IPC protocol between
      # libudev and udevd so we need to link with it dynamically.
-     VENDOR_ARGS=--enable-nvidia-multiarch --enable-static-libcap --enable-static-libapparmor --enable-static-libseccomp
+     VENDOR_ARGS=--enable-nvidia-multiarch --enable-static-libcap --enable-static-libapparmor --enable-static-libseccomp --with-host-arch-triplet=$(DEB_HOST_MULTIARCH)
+ ifeq ($(shell dpkg-architecture -qDEB_HOST_ARCH),amd64)
+               VENDOR_ARGS+= --with-host-arch-32bit-triplet=$(shell dpkg-architecture -f -ai386 -qDEB_HOST_MULTIARCH)
+ endif
      BUILT_USING_PACKAGES=libcap-dev libapparmor-dev libseccomp-dev
-     BUILT_USING=$(shell dpkg-query -f '$${source:Package} (= $${source:Version}), ' -W $(BUILT_USING_PACKAGES))
  else
 -ifeq ($(shell dpkg-vendor --query Vendor),Debian)
      VENDOR_ARGS=--enable-nvidia-multiarch
-     BUILT_USING=
+     BUILT_USING_PACKAGES=libcap-dev
 -else
 -    VENDOR_ARGS=--disable-apparmor
 -endif
  endif
+ BUILT_USING=$(shell dpkg-query -f '$${source:Package} (= $${source:Version}), ' -W $(BUILT_USING_PACKAGES))
  
  %:
        dh $@ --buildsystem=golang --with=golang --fail-missing --with systemd --builddirectory=_build