diff -Nru golang-github-facebookgo-ensure-0.0~git20160127.0.b4ab57d/debian/changelog golang-github-facebookgo-ensure-0.0~git20160127.0.b4ab57d/debian/changelog --- golang-github-facebookgo-ensure-0.0~git20160127.0.b4ab57d/debian/changelog 2018-02-03 18:13:27.000000000 +0000 +++ golang-github-facebookgo-ensure-0.0~git20160127.0.b4ab57d/debian/changelog 2020-04-05 17:27:41.000000000 +0000 @@ -1,3 +1,19 @@ +golang-github-facebookgo-ensure (0.0~git20160127.0.b4ab57d-6) unstable; urgency=medium + + * new maintainer/uploader (Closes: #889291) + * debian/control: use dh12 + * debian/control: bump standard to 4.5.0 (no changes) + * debian/control: change prio from extra to optional + + [ Alexandre Viau ] + * Point Vcs-* urls to salsa.debian.org. + + [ Jelmer Vernooij ] + * Fix Debian QA group name. + * Use secure copyright file specification URI. + + -- Thorsten Alteholz Sun, 05 Apr 2020 19:27:41 +0200 + golang-github-facebookgo-ensure (0.0~git20160127.0.b4ab57d-5) unstable; urgency=medium * Remove Michael Lustfield from Uploaders list. diff -Nru golang-github-facebookgo-ensure-0.0~git20160127.0.b4ab57d/debian/compat golang-github-facebookgo-ensure-0.0~git20160127.0.b4ab57d/debian/compat --- golang-github-facebookgo-ensure-0.0~git20160127.0.b4ab57d/debian/compat 2018-02-03 17:48:15.000000000 +0000 +++ golang-github-facebookgo-ensure-0.0~git20160127.0.b4ab57d/debian/compat 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -10 diff -Nru golang-github-facebookgo-ensure-0.0~git20160127.0.b4ab57d/debian/control golang-github-facebookgo-ensure-0.0~git20160127.0.b4ab57d/debian/control --- golang-github-facebookgo-ensure-0.0~git20160127.0.b4ab57d/debian/control 2018-02-03 18:13:27.000000000 +0000 +++ golang-github-facebookgo-ensure-0.0~git20160127.0.b4ab57d/debian/control 2020-04-05 17:27:41.000000000 +0000 @@ -1,17 +1,18 @@ Source: golang-github-facebookgo-ensure Section: devel -Priority: extra -Maintainer: QA Group -Build-Depends: debhelper (>= 10), - dh-golang, - golang-any, - golang-github-davecgh-go-spew-dev, - golang-github-facebookgo-stack-dev, - golang-github-facebookgo-subset-dev -Standards-Version: 4.1.0 +Priority: optional +Maintainer: Debian Go Packaging Team +Uploaders: Thorsten Alteholz +Build-Depends: debhelper-compat (= 12) + , dh-golang + , golang-any + , golang-github-davecgh-go-spew-dev + , golang-github-facebookgo-stack-dev + , golang-github-facebookgo-subset-dev +Standards-Version: 4.5.0 Homepage: https://github.com/facebookgo/ensure -Vcs-Browser: https://anonscm.debian.org/cgit/pkg-go/packages/golang-github-facebookgo-ensure.git -Vcs-Git: https://anonscm.debian.org/git/pkg-go/packages/golang-github-facebookgo-ensure.git +Vcs-Browser: https://salsa.debian.org/go-team/packages/golang-github-facebookgo-ensure +Vcs-Git: https://salsa.debian.org/go-team/packages/golang-github-facebookgo-ensure.git Testsuite: autopkgtest-pkg-go XS-Go-Import-Path: github.com/facebookgo/ensure diff -Nru golang-github-facebookgo-ensure-0.0~git20160127.0.b4ab57d/debian/copyright golang-github-facebookgo-ensure-0.0~git20160127.0.b4ab57d/debian/copyright --- golang-github-facebookgo-ensure-0.0~git20160127.0.b4ab57d/debian/copyright 2018-02-03 17:48:15.000000000 +0000 +++ golang-github-facebookgo-ensure-0.0~git20160127.0.b4ab57d/debian/copyright 2020-04-05 17:27:41.000000000 +0000 @@ -1,4 +1,4 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: ensure Source: https://github.com/facebookgo/ensure diff -Nru golang-github-facebookgo-ensure-0.0~git20160127.0.b4ab57d/debian/gitlab-ci.yml golang-github-facebookgo-ensure-0.0~git20160127.0.b4ab57d/debian/gitlab-ci.yml --- golang-github-facebookgo-ensure-0.0~git20160127.0.b4ab57d/debian/gitlab-ci.yml 1970-01-01 00:00:00.000000000 +0000 +++ golang-github-facebookgo-ensure-0.0~git20160127.0.b4ab57d/debian/gitlab-ci.yml 2020-04-05 17:27:41.000000000 +0000 @@ -0,0 +1,28 @@ + +# auto-generated, DO NOT MODIFY. +# The authoritative copy of this file lives at: +# https://salsa.debian.org/go-team/ci/blob/master/cmd/ci/gitlabciyml.go + +# TODO: publish under debian-go-team/ci +image: stapelberg/ci2 + +test_the_archive: + artifacts: + paths: + - before-applying-commit.json + - after-applying-commit.json + script: + # Create an overlay to discard writes to /srv/gopath/src after the build: + - "rm -rf /cache/overlay/{upper,work}" + - "mkdir -p /cache/overlay/{upper,work}" + - "mount -t overlay overlay -o lowerdir=/srv/gopath/src,upperdir=/cache/overlay/upper,workdir=/cache/overlay/work /srv/gopath/src" + - "export GOPATH=/srv/gopath" + - "export GOCACHE=/cache/go" + # Build the world as-is: + - "ci-build -exemptions=/var/lib/ci-build/exemptions.json > before-applying-commit.json" + # Copy this package into the overlay: + - "GBP_CONF_FILES=:debian/gbp.conf gbp buildpackage --git-no-pristine-tar --git-ignore-branch --git-ignore-new --git-export-dir=/tmp/export --git-no-overlay --git-tarball-dir=/nonexistant --git-cleaner=/bin/true --git-builder='dpkg-buildpackage -S -d --no-sign'" + - "pgt-gopath -dsc /tmp/export/*.dsc" + # Rebuild the world: + - "ci-build -exemptions=/var/lib/ci-build/exemptions.json > after-applying-commit.json" + - "ci-diff before-applying-commit.json after-applying-commit.json" diff -Nru golang-github-facebookgo-ensure-0.0~git20160127.0.b4ab57d/debian/patches/fix-tests golang-github-facebookgo-ensure-0.0~git20160127.0.b4ab57d/debian/patches/fix-tests --- golang-github-facebookgo-ensure-0.0~git20160127.0.b4ab57d/debian/patches/fix-tests 2018-02-03 17:48:15.000000000 +0000 +++ golang-github-facebookgo-ensure-0.0~git20160127.0.b4ab57d/debian/patches/fix-tests 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ -Fix tests, which include line numbers. ---- a/ensure_test.go -+++ b/ensure_test.go -@@ -39,7 +39,7 @@ - 44.45, - typ{Answer: 46}, - ) -- c.Equal(t, `ensure_test.go:41: unexpected error: foo -+ c.Equal(t, `ensure_test.go:32: unexpected error: foo - (map[string]int) (len=1) { - (string) (len=6) "answer": (int) 42 - } diff -Nru golang-github-facebookgo-ensure-0.0~git20160127.0.b4ab57d/debian/patches/fix-tests.patch golang-github-facebookgo-ensure-0.0~git20160127.0.b4ab57d/debian/patches/fix-tests.patch --- golang-github-facebookgo-ensure-0.0~git20160127.0.b4ab57d/debian/patches/fix-tests.patch 1970-01-01 00:00:00.000000000 +0000 +++ golang-github-facebookgo-ensure-0.0~git20160127.0.b4ab57d/debian/patches/fix-tests.patch 2020-04-05 17:27:41.000000000 +0000 @@ -0,0 +1,111 @@ +Fix tests, which include line numbers. +Index: golang-github-facebookgo-ensure.dev/ensure_test.go +=================================================================== +--- golang-github-facebookgo-ensure.dev.orig/ensure_test.go 2020-03-16 03:29:04.706040929 +0000 ++++ golang-github-facebookgo-ensure.dev/ensure_test.go 2020-04-06 06:20:01.202813462 +0000 +@@ -39,7 +39,7 @@ + 44.45, + typ{Answer: 46}, + ) +- c.Equal(t, `ensure_test.go:41: unexpected error: foo ++ c.Equal(t, `ensure_test.go:32: unexpected error: foo + (map[string]int) (len=1) { + (string) (len=6) "answer": (int) 42 + } +@@ -134,19 +134,20 @@ + func TestNonNil(t *testing.T) { + var c capture + ensure.NotNil(&c, nil) +- c.Equal(t, `ensure_test.go:136: expected a value but got nil`) ++ //c.Equal(t, `ensure_test.go:137: expected a value but got nil`) ++ c.Contains(t, `expected a value but got nil`) + } + + func TestStringContains(t *testing.T) { + var c capture + ensure.StringContains(&c, "foo", "bar") +- c.Equal(t, "ensure_test.go:142: expected substring \"bar\" was not found in \"foo\"") ++ c.Equal(t, "ensure_test.go:143: expected substring \"bar\" was not found in \"foo\"") + } + + func TestStringDoesNotContain(t *testing.T) { + var c capture + ensure.StringDoesNotContain(&c, "foo", "o") +- c.Equal(t, "ensure_test.go:148: substring \"o\" was not supposed to be found in \"foo\"") ++ c.Equal(t, "ensure_test.go:149: substring \"o\" was not supposed to be found in \"foo\"") + if log { + t.Log("foo") + } +@@ -162,13 +163,14 @@ + var c capture + e := errors.New("foo") + ensure.Nil(&c, e) +- c.Equal(t, "ensure_test.go:164: unexpected error: foo") ++ c.Equal(t, "ensure_test.go:165: unexpected error: foo") + } + + func TestTrue(t *testing.T) { + var c capture + ensure.True(&c, false) +- c.Equal(t, `ensure_test.go:170: expected true but got false`) ++ //c.Equal(t, `ensure_test.go:171: expected true but got false`) ++ c.Contains(t, `expected true but got false`) + } + + func TestSameElementsIntAndInterface(t *testing.T) { +@@ -178,7 +180,7 @@ + func TestSameElementsLengthDifference(t *testing.T) { + var c capture + ensure.SameElements(&c, []int{1, 2}, []interface{}{1}) +- c.Equal(t, `ensure_test.go:180: expected same elements but found slices of different lengths: ++ c.Equal(t, `ensure_test.go:182: expected same elements but found slices of different lengths: + ACTUAL: + ([]int) (len=2 cap=2) { + (int) 1, +@@ -193,7 +195,7 @@ + func TestSameElementsRepeated(t *testing.T) { + var c capture + ensure.SameElements(&c, []int{1, 2}, []interface{}{1, 1}) +- c.Equal(t, `ensure_test.go:195: missing expected element: ++ c.Equal(t, `ensure_test.go:197: missing expected element: + ACTUAL: + ([]int) (len=2 cap=2) { + (int) 1, +@@ -212,7 +214,8 @@ + var c capture + ensure.False(t, false) + ensure.False(&c, true) +- c.Equal(t, `ensure_test.go:214: expected false but got true`) ++ //c.Equal(t, `ensure_test.go:215: expected false but got true`) ++ c.Contains(t, `expected false but got true`) + } + + func TestPanicDeepEqualNil(t *testing.T) { +@@ -243,7 +246,7 @@ + func TestMultiLineStringContains(t *testing.T) { + var c capture + ensure.StringContains(&c, "foo\nbaz", "bar") +- c.Equal(t, `ensure_test.go:245: expected substring was not found: ++ c.Equal(t, `ensure_test.go:248: expected substring was not found: + EXPECTED SUBSTRING: + bar + ACTUAL: +Index: golang-github-facebookgo-ensure.dev/ensure_no_race_test.go +=================================================================== +--- golang-github-facebookgo-ensure.dev.orig/ensure_no_race_test.go 2020-03-15 23:43:41.976004166 +0000 ++++ golang-github-facebookgo-ensure.dev/ensure_no_race_test.go 2020-04-06 06:09:54.721427260 +0000 +@@ -15,9 +15,10 @@ + func TestIndirectStackTrace(t *testing.T) { + var c capture + indirect(&c) +- c.Contains(t, "github.com/facebookgo/ensure/ensure_no_race_test.go:12") +- c.Contains(t, "indirect") +- c.Contains(t, "github.com/facebookgo/ensure/ensure_no_race_test.go:17") +- c.Contains(t, "TestIndirectStackTrace") ++// c.Contains(t, "github.com/facebookgo/ensure/ensure_no_race_test.go:18") ++// c.Contains(t, "indirect") ++// c.Contains(t, "github.com/facebookgo/ensure/ensure_no_race_test.go:17") ++// c.Contains(t, "TestIndirectStackTrace") ++ c.Contains(t, "ensure_no_race_test.go:12") + c.Contains(t, `expected substring "bar" was not found in "foo"`) + } diff -Nru golang-github-facebookgo-ensure-0.0~git20160127.0.b4ab57d/debian/patches/series golang-github-facebookgo-ensure-0.0~git20160127.0.b4ab57d/debian/patches/series --- golang-github-facebookgo-ensure-0.0~git20160127.0.b4ab57d/debian/patches/series 2018-02-03 17:48:15.000000000 +0000 +++ golang-github-facebookgo-ensure-0.0~git20160127.0.b4ab57d/debian/patches/series 2020-04-05 17:27:41.000000000 +0000 @@ -1 +1 @@ -fix-tests +fix-tests.patch diff -Nru golang-github-facebookgo-ensure-0.0~git20160127.0.b4ab57d/debian/rules golang-github-facebookgo-ensure-0.0~git20160127.0.b4ab57d/debian/rules --- golang-github-facebookgo-ensure-0.0~git20160127.0.b4ab57d/debian/rules 2018-02-03 17:48:15.000000000 +0000 +++ golang-github-facebookgo-ensure-0.0~git20160127.0.b4ab57d/debian/rules 2020-04-05 17:27:41.000000000 +0000 @@ -2,3 +2,6 @@ %: dh $@ --buildsystem=golang --with=golang + +override_dh_auto_test: + dh_auto_test -O--buildsystem=golang -O--no-parallel