diff -Nru golang-github-docker-goamz-0.0~git20160206.0.f0a21f5/debian/changelog golang-github-docker-goamz-0.0~git20160206.0.f0a21f5/debian/changelog
--- golang-github-docker-goamz-0.0~git20160206.0.f0a21f5/debian/changelog	2016-11-01 05:27:40.000000000 +0000
+++ golang-github-docker-goamz-0.0~git20160206.0.f0a21f5/debian/changelog	2018-02-16 21:01:43.000000000 +0000
@@ -1,3 +1,17 @@
+golang-github-docker-goamz (0.0~git20160206.0.f0a21f5-3) unstable; urgency=medium
+
+  * Team upload.
+  * drop incorrect test-fixture-locations.patch
+  * add fix-TestPutAllZeroSizeFile.patch
+
+ -- Michael Stapelberg <stapelberg@debian.org>  Fri, 16 Feb 2018 22:01:43 +0100
+
+golang-github-docker-goamz (0.0~git20160206.0.f0a21f5-2) unstable; urgency=medium
+
+  * Replace golang-go with golang-any in Build-Depends, remove golang-go from Depends
+
+ -- Konstantinos Margaritis <markos@debian.org>  Wed, 09 Aug 2017 17:10:18 +0300
+
 golang-github-docker-goamz (0.0~git20160206.0.f0a21f5-1) unstable; urgency=medium
 
   * Initial release (Closes: #853788)
diff -Nru golang-github-docker-goamz-0.0~git20160206.0.f0a21f5/debian/control golang-github-docker-goamz-0.0~git20160206.0.f0a21f5/debian/control
--- golang-github-docker-goamz-0.0~git20160206.0.f0a21f5/debian/control	2016-11-01 05:27:40.000000000 +0000
+++ golang-github-docker-goamz-0.0~git20160206.0.f0a21f5/debian/control	2018-02-16 21:01:43.000000000 +0000
@@ -4,8 +4,8 @@
 Maintainer: Debian Go Packaging Team <pkg-go-maintainers@lists.alioth.debian.org>
 Uploaders: Tim Potter <tpot@hpe.com>
 Build-Depends: debhelper (>= 9),
-               dh-golang,
-               golang-go,
+               dh-golang (>= 1.31),
+               golang-any,
                golang-github-bitly-go-simplejson-dev,
                golang-github-cbroglie-mapstructure-dev,
                golang-gopkg-check.v1-dev
@@ -19,7 +19,6 @@
 Architecture: all
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         golang-go,
          golang-github-bitly-go-simplejson-dev,
          golang-github-cbroglie-mapstructure-dev
 Description: Enable Go programs to interact with Amazon Web Services
diff -Nru golang-github-docker-goamz-0.0~git20160206.0.f0a21f5/debian/patches/fix-TestPutAllZeroSizeFile.patch golang-github-docker-goamz-0.0~git20160206.0.f0a21f5/debian/patches/fix-TestPutAllZeroSizeFile.patch
--- golang-github-docker-goamz-0.0~git20160206.0.f0a21f5/debian/patches/fix-TestPutAllZeroSizeFile.patch	1970-01-01 00:00:00.000000000 +0000
+++ golang-github-docker-goamz-0.0~git20160206.0.f0a21f5/debian/patches/fix-TestPutAllZeroSizeFile.patch	2018-02-16 21:01:43.000000000 +0000
@@ -0,0 +1,31 @@
+Description: fix TestPutAllZeroSizeFile
+Origin: vendor, https://github.com/AdRoll/goamz/commit/a063308c323ba551620d832e9a48bd452d6dce26
+Author: Nevmera I <gronpipmaster@gmail.com>
+Last-Update: 2018-02-16
+
+---
+
+From a063308c323ba551620d832e9a48bd452d6dce26 Mon Sep 17 00:00:00 2001
+From: Nevmera I <gronpipmaster@gmail.com>
+Date: Fri, 9 Dec 2016 16:56:50 +0700
+Subject: [PATCH] bug fixed TestPutAllZeroSizeFile
+
+---
+ s3/multi_test.go | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/s3/multi_test.go b/s3/multi_test.go
+index b76f70eb..2a01faa2 100644
+--- a/s3/multi_test.go
++++ b/s3/multi_test.go
+@@ -292,7 +292,9 @@ func (s *S) TestPutAllZeroSizeFile(c *check.C) {
+ 	c.Assert(req.Method, check.Equals, "PUT")
+ 	c.Assert(req.URL.Path, check.Equals, "/sample/multi")
+ 	c.Assert(req.Form["partNumber"], check.DeepEquals, []string{"1"})
+-	c.Assert(req.Header["Content-Length"], check.DeepEquals, []string{"0"})
++	if len(req.Header["Content-Length"]) > 0 {
++		c.Assert(req.Header["Content-Length"][0], check.Equals, "0")
++	}
+ 	c.Assert(readAll(req.Body), check.Equals, "")
+ }
+ 
diff -Nru golang-github-docker-goamz-0.0~git20160206.0.f0a21f5/debian/patches/series golang-github-docker-goamz-0.0~git20160206.0.f0a21f5/debian/patches/series
--- golang-github-docker-goamz-0.0~git20160206.0.f0a21f5/debian/patches/series	2016-11-01 05:27:40.000000000 +0000
+++ golang-github-docker-goamz-0.0~git20160206.0.f0a21f5/debian/patches/series	2018-02-16 21:01:43.000000000 +0000
@@ -1,2 +1,2 @@
 disable-cloudwatch.patch
-test-fixture-locations.patch
+fix-TestPutAllZeroSizeFile.patch
diff -Nru golang-github-docker-goamz-0.0~git20160206.0.f0a21f5/debian/patches/test-fixture-locations.patch golang-github-docker-goamz-0.0~git20160206.0.f0a21f5/debian/patches/test-fixture-locations.patch
--- golang-github-docker-goamz-0.0~git20160206.0.f0a21f5/debian/patches/test-fixture-locations.patch	2016-11-01 05:27:40.000000000 +0000
+++ golang-github-docker-goamz-0.0~git20160206.0.f0a21f5/debian/patches/test-fixture-locations.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-Index: golang-github-docker-goamz/cloudfront/cloudfront_test.go
-===================================================================
---- golang-github-docker-goamz.orig/cloudfront/cloudfront_test.go
-+++ golang-github-docker-goamz/cloudfront/cloudfront_test.go
-@@ -10,7 +10,7 @@ import (
- )
- 
- func TestSignedCannedURL(t *testing.T) {
--	rawKey, err := ioutil.ReadFile("testdata/key.pem")
-+	rawKey, err := ioutil.ReadFile("../../../../../../cloudfront/testdata/key.pem")
- 	if err != nil {
- 		t.Fatal(err)
- 	}