Merge version 1.10.5-1+rpi1 and 1.10.7-2 to produce 1.10.7-2+rpi1

diff --cc debian/changelog
index 9685f18cdde4c543d6d71c05061d259323ad0264,eccae70fbaeb09c7b8d0a081ffd39a19fa9246a9..6bd3b24ded211c875754c7b8081ddcf9ddce42a1
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,41 +1,50 @@@
- golang-1.10 (1.10.5-1+rpi1) buster-staging; urgency=medium
++golang-1.10 (1.10.7-2+rpi1) buster-staging; urgency=medium
 +
 +  [changes brought forward from 1.10~rc2-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sat, 24 Feb 2018 12:22:04 +0000]
 +  * Build with GOARM=6
 +  * Disable testsuite.
 +  * Fix clean target.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Mon, 03 Dec 2018 16:25:29 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 03 Jan 2019 10:55:36 +0000
++
+ golang-1.10 (1.10.7-2) unstable; urgency=medium
+ 
+   [ Dr. Tobias Quathamer ]
+   * Switch team address to tracker.d.o
+   * Do not compress favicon.ico.
+     Thanks to Dato Simó <dato@debian.org> (Closes: #917132)
+   * Update patches for git-buildpackage
+ 
+   [ Anthony Fok ]
+   * Bump Standards-Version to 4.3.0 (no change)
+ 
+  -- Dr. Tobias Quathamer <toddy@debian.org>  Fri, 28 Dec 2018 16:11:01 +0100
+ 
+ golang-1.10 (1.10.7-1) unstable; urgency=medium
+ 
+   * New upstream version 1.10.7
+   * Override two false positive Lintian errors (missing depends
+     on sensible-utils)
+   * Add lintian overrides for testdata
+   * Include /usr/share/dpkg/architecture.mk for DEB_HOST_ARCH
+   * Fix Lintian warnings about wrong interpreter path
+   * Make two scripts executable which have been missed by upstream
+   * Update d/copyright
+   * Remove unused lintian overrides
+ 
+  -- Dr. Tobias Quathamer <toddy@debian.org>  Sun, 16 Dec 2018 13:37:11 +0100
+ 
+ golang-1.10 (1.10.6-1) unstable; urgency=medium
+ 
+   * New upstream version 1.10.6
+   * Update gbp.conf to new style syntax
+   * Add myself to Uploaders
+   * Use debhelper v11
+   * Use HTTPS URL for d/watch
+   * Update to Standards-Version 4.2.1
+     - Use HTTPS for d/copyright
+ 
+  -- Dr. Tobias Quathamer <toddy@debian.org>  Thu, 13 Dec 2018 23:13:52 +0100
  
  golang-1.10 (1.10.5-1) unstable; urgency=medium
  

diff --cc debian/rules
index a4dd5fa46af817bc97b902a8fc8cd8a57bbc790d,0e5d005692dbd25c5efb8ff9a76655cf202c93e5..e14da637f0d41c1f29e5b78772307b7b5d5cbeb8
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -7,9 -7,10 +7,11 @@@ export GOVER := $(shell perl -w -mDpkg:
  export GOROOT := $(CURDIR)
  export GOROOT_FINAL := /usr/lib/go-$(GOVER)
  export GOCACHE := off
 +export GOARM := 6
  
- DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH 2>/dev/null)
+ # We need DEB_HOST_ARCH, so include the needed makefile snippet
+ include /usr/share/dpkg/architecture.mk
+ 
  RUN_TESTS := true
  # armel: ???
  # ppc64: ???