diff --git a/debian/control b/debian/control index 4b70d65..3d34e84 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Priority: extra Maintainer: Debian Go Packaging Team Uploaders: Tim Potter -Build-Depends: debhelper (>= 9), dh-golang, golang-any, golang-yaml.v2-dev +Build-Depends: debhelper (>= 9), dh-golang (>= 1.31), golang-any, golang-yaml.v2-dev Standards-Version: 3.9.8 Homepage: https://github.com/imdario/mergo Vcs-Browser: https://anonscm.debian.org/cgit/pkg-go/packages/golang-github-imdario-mergo.git diff --git a/debian/patches/0002-fix-test-fixture-locations.patch b/debian/patches/0002-fix-test-fixture-locations.patch deleted file mode 100644 index ad2271f..0000000 --- a/debian/patches/0002-fix-test-fixture-locations.patch +++ /dev/null @@ -1,23 +0,0 @@ -Description: Modify test fixture paths - The Debian packging process executes Go tests in a subdirectory - which is not handled correctly. The path to each test fixture - file has been updated to reflect this. -Author: Tim Potter -Forwarded: no ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ -Index: golang-github-imdario-mergo/mergo_test.go -=================================================================== ---- golang-github-imdario-mergo.orig/mergo_test.go -+++ golang-github-imdario-mergo/mergo_test.go -@@ -314,8 +314,8 @@ func TestMaps(t *testing.T) { - } - - func TestYAMLMaps(t *testing.T) { -- thing := loadYAML("testdata/thing.yml") -- license := loadYAML("testdata/license.yml") -+ thing := loadYAML("../../../../../testdata/thing.yml") -+ license := loadYAML("../../../../../testdata/license.yml") - ft := thing["fields"].(map[interface{}]interface{}) - fl := license["fields"].(map[interface{}]interface{}) - expectedLength := len(ft) + len(fl) diff --git a/debian/patches/series b/debian/patches/series index 4a5a7c3..89ecc4d 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1 @@ 0001-use-newer-yaml-library.patch -0002-fix-test-fixture-locations.patch