diff -Nru golang-github-matryer-try-1+git20161228.6.9ac251b/debian/changelog golang-github-matryer-try-1+git20161228.6.9ac251b/debian/changelog --- golang-github-matryer-try-1+git20161228.6.9ac251b/debian/changelog 2021-01-08 13:59:35.000000000 +0000 +++ golang-github-matryer-try-1+git20161228.6.9ac251b/debian/changelog 2022-03-16 18:50:42.000000000 +0000 @@ -1,3 +1,9 @@ +golang-github-matryer-try (1+git20161228.6.9ac251b-2.1ubuntu1) jammy; urgency=medium + + * Remove unused variables to fix FTBFS with Go 1.18 + + -- William 'jawn-smith' Wilson Wed, 16 Mar 2022 13:50:42 -0500 + golang-github-matryer-try (1+git20161228.6.9ac251b-2.1) unstable; urgency=medium * Non maintainer upload by the Reproducible Builds team. diff -Nru golang-github-matryer-try-1+git20161228.6.9ac251b/debian/control golang-github-matryer-try-1+git20161228.6.9ac251b/debian/control --- golang-github-matryer-try-1+git20161228.6.9ac251b/debian/control 2018-04-10 15:06:43.000000000 +0000 +++ golang-github-matryer-try-1+git20161228.6.9ac251b/debian/control 2022-03-16 18:50:42.000000000 +0000 @@ -1,5 +1,6 @@ Source: golang-github-matryer-try -Maintainer: Debian Go Packaging Team +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian Go Packaging Team Uploaders: Anthony Fok Section: devel Testsuite: autopkgtest-pkg-go diff -Nru golang-github-matryer-try-1+git20161228.6.9ac251b/debian/patches/fix-ftbfs-with-go1.18.patch golang-github-matryer-try-1+git20161228.6.9ac251b/debian/patches/fix-ftbfs-with-go1.18.patch --- golang-github-matryer-try-1+git20161228.6.9ac251b/debian/patches/fix-ftbfs-with-go1.18.patch 1970-01-01 00:00:00.000000000 +0000 +++ golang-github-matryer-try-1+git20161228.6.9ac251b/debian/patches/fix-ftbfs-with-go1.18.patch 2022-03-16 18:50:42.000000000 +0000 @@ -0,0 +1,43 @@ +Description: Fix FTBFS with Go 1.18 + Go 1.18 is more strict about unused variables. This patch + removes some unused variables to enable building this + package against Go 1.18 +Author: William 'jawn-smith' Wilson +Forwarded: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1007789 +Applied-Upstream: https://github.com/matryer/try/pull/7 +Last-Update: 2022-03-16 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +Index: golang-github-matryer-try-1+git20161228.6.9ac251b/try_test.go +=================================================================== +--- golang-github-matryer-try-1+git20161228.6.9ac251b.orig/try_test.go ++++ golang-github-matryer-try-1+git20161228.6.9ac251b/try_test.go +@@ -15,10 +15,9 @@ + SomeFunction := func() (string, error) { + return "", nil + } +- var value string + err := try.Do(func(attempt int) (bool, error) { + var err error +- value, err = SomeFunction() ++ _, err = SomeFunction() + return attempt < 5, err // try 5 times + }) + if err != nil { +@@ -30,7 +29,6 @@ + SomeFunction := func() (string, error) { + panic("something went badly wrong") + } +- var value string + err := try.Do(func(attempt int) (retry bool, err error) { + retry = attempt < 5 // try 5 times + defer func() { +@@ -38,7 +36,7 @@ + err = errors.New(fmt.Sprintf("panic: %v", r)) + } + }() +- value, err = SomeFunction() ++ _, err = SomeFunction() + return + }) + if err != nil { diff -Nru golang-github-matryer-try-1+git20161228.6.9ac251b/debian/patches/series golang-github-matryer-try-1+git20161228.6.9ac251b/debian/patches/series --- golang-github-matryer-try-1+git20161228.6.9ac251b/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ golang-github-matryer-try-1+git20161228.6.9ac251b/debian/patches/series 2022-03-16 18:50:07.000000000 +0000 @@ -0,0 +1 @@ +fix-ftbfs-with-go1.18.patch