[Pkg-golang-commits] [golang] 03/03: Remove d/patches/cl-29995--tzdata-2016g.patch, included upstream.

[Michael Hudson-Doyle]

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

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

commit 2f77c44343d3dbdd7fb225cd66099a37a0b751e4
Author: Michael Hudson-Doyle <michael.hudson at canonical.com>
Date:   Thu Dec 8 10:16:46 2016 +1300

    Remove d/patches/cl-29995--tzdata-2016g.patch, included upstream.
---
 debian/changelog                            |  1 +
 debian/patches/cl-29995--tzdata-2016g.patch | 35 -----------------------------
 debian/patches/series                       |  1 -
 3 files changed, 1 insertion(+), 36 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0da3ff3..5085bbc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 golang-1.8 (1.8~beta1-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+  * Remove d/patches/cl-29995--tzdata-2016g.patch, included upstream. 
 
  -- Michael Hudson-Doyle <michael.hudson at ubuntu.com>  Thu, 08 Dec 2016 10:12:19 +1300
 
diff --git a/debian/patches/cl-29995--tzdata-2016g.patch b/debian/patches/cl-29995--tzdata-2016g.patch
deleted file mode 100644
index 6c60949..0000000
--- a/debian/patches/cl-29995--tzdata-2016g.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From c5434f2973a87acff76bac359236e690d632ce95 Mon Sep 17 00:00:00 2001
-From: Alberto Donizetti <alb.donizetti at gmail.com>
-Date: Thu, 29 Sep 2016 13:59:10 +0200
-Subject: [PATCH] time: update test for tzdata-2016g
-Origin: https://golang.org/cl/29995
-Bug: https://golang.org/issue/17276
-Applied-Upstream: 1.8
-
-Fixes #17276
-
-Change-Id: I0188cf9bc5fdb48c71ad929cc54206d03e0b96e4
-Reviewed-on: https://go-review.googlesource.com/29995
-Reviewed-by: Brad Fitzpatrick <bradfitz at golang.org>
-Run-TryBot: Brad Fitzpatrick <bradfitz at golang.org>
-TryBot-Result: Gobot Gobot <gobot at golang.org>
----
- src/time/time_test.go | 7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
---- a/src/time/time_test.go
-+++ b/src/time/time_test.go
-@@ -939,8 +939,11 @@
- 	// but Go and most other systems use "east is positive".
- 	// So GMT+1 corresponds to -3600 in the Go zone, not +3600.
- 	name, offset := Now().In(loc).Zone()
--	if name != "GMT+1" || offset != -1*60*60 {
--		t.Errorf("Now().In(loc).Zone() = %q, %d, want %q, %d", name, offset, "GMT+1", -1*60*60)
-+	// The zone abbreviation is "-01" since tzdata-2016g, and "GMT+1"
-+	// on earlier versions; we accept both. (Issue #17276).
-+	if !(name == "GMT+1" || name == "-01") || offset != -1*60*60 {
-+		t.Errorf("Now().In(loc).Zone() = %q, %d, want %q or %q, %d",
-+			name, offset, "GMT+1", "-01", -1*60*60)
- 	}
- }
- 
diff --git a/debian/patches/series b/debian/patches/series
index 14031e5..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +0,0 @@
-cl-29995--tzdata-2016g.patch

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