[Pkg-golang-commits] [golang] 02/02: update to 1.9 release

[Michael Hudson-Doyle]

This is an automated email from the git hooks/post-receive script.

mwhudson-guest pushed a commit to branch golang-1.9
in repository golang.

commit 03ec5b80eb745e6908c3a371085a9b36b9250c4a
Author: Michael Hudson-Doyle <michael.hudson at canonical.com>
Date:   Fri Aug 25 12:30:18 2017 +1200

    update to 1.9 release
---
 debian/changelog                 |  4 +---
 debian/patches/issue-20284.patch | 37 -------------------------------------
 debian/patches/series            |  1 -
 3 files changed, 1 insertion(+), 41 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5d01019..21969df 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,6 @@
-golang-1.9 (1.9~beta1-1) UNRELEASED; urgency=medium
+golang-1.9 (1.9-1) UNRELEASED; urgency=medium
 
   * New upstream release.
-  * Add d/patches/issue-20284.patch to work around an upstream build-time
-    issue.
 
  -- Michael Hudson-Doyle <michael.hudson at ubuntu.com>  Thu, 15 Jun 2017 13:10:59 +1200
 
diff --git a/debian/patches/issue-20284.patch b/debian/patches/issue-20284.patch
deleted file mode 100644
index 03a7f6c..0000000
--- a/debian/patches/issue-20284.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Description: Skip test that fails with GOROOT_FINAL set.
-Author: Michael Hudson-Doyle <michael.hudson at ubuntu.com>
-Bug: https://github.com/golang/go/issues/20284
-Last-Update: 2017-06-15
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/src/cmd/go/go_test.go
-+++ b/src/cmd/go/go_test.go
-@@ -4001,17 +4001,19 @@
- 		equal = strings.EqualFold
- 	}
- 
-+	// This part of the test fails when the go tool was built with
-+	// GOROOT_FINAL set, see // https://github.com/golang/go/issues/20284
- 	// macOS uses a symlink for /tmp.
--	resolvedTestGOROOT, err := filepath.EvalSymlinks(testGOROOT)
--	if err != nil {
--		t.Fatalf("could not eval testgoroot symlinks: %v", err)
--	}
-+	// resolvedTestGOROOT, err := filepath.EvalSymlinks(testGOROOT)
-+	// if err != nil {
-+	// 	t.Fatalf("could not eval testgoroot symlinks: %v", err)
-+	// }
- 
--	// Missing GOROOT/pkg/tool, the go tool should fall back to
--	// its default path.
--	if got, want := goroot(newGoTool), resolvedTestGOROOT; !equal(got, want) {
--		t.Fatalf("%s env GOROOT = %q, want %q", newGoTool, got, want)
--	}
-+	// // Missing GOROOT/pkg/tool, the go tool should fall back to
-+	// // its default path.
-+	// if got, want := goroot(newGoTool), resolvedTestGOROOT; !equal(got, want) {
-+	// 	t.Fatalf("%s env GOROOT = %q, want %q", newGoTool, got, want)
-+	// }
- 
- 	// Now the executable's path looks like a GOROOT.
- 	tg.tempDir("newgoroot/pkg/tool")
diff --git a/debian/patches/series b/debian/patches/series
index 79f3597..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +0,0 @@
-issue-20284.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-golang/golang.git