[Pkg-golang-commits] [golang] 01/01: Backport CL 29995 for tzdata 2016g changes (Closes: #839298)

[Tianon Gravi]

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

tianon pushed a commit to branch golang-1.6
in repository golang.

commit 8dfa53e30f639913e8da12d80838bb49a9b39c9c
Author: Tianon Gravi <tianon at debian.org>
Date:   Mon Oct 3 12:48:57 2016 -0700

    Backport CL 29995 for tzdata 2016g changes (Closes: #839298)
---
 debian/changelog                            |  6 +++++
 debian/patches/cl-29995--tzdata-2016g.patch | 37 +++++++++++++++++++++++++++++
 debian/patches/series                       |  1 +
 3 files changed, 44 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 9a3a0e6..4952312 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+golang-1.6 (1.6.3-2) UNRELEASED; urgency=medium
+
+  * Backport CL 29995 for tzdata 2016g changes (Closes: #839298)
+
+ -- Tianon Gravi <tianon at debian.org>  Mon, 03 Oct 2016 12:50:34 -0700
+
 golang-1.6 (1.6.3-1) unstable; urgency=medium
 
   [ Michael Hudson-Doyle ]
diff --git a/debian/patches/cl-29995--tzdata-2016g.patch b/debian/patches/cl-29995--tzdata-2016g.patch
new file mode 100644
index 0000000..f5fed82
--- /dev/null
+++ b/debian/patches/cl-29995--tzdata-2016g.patch
@@ -0,0 +1,37 @@
+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(-)
+
+diff --git a/src/time/time_test.go b/src/time/time_test.go
+index 68236fd..2e47d08 100644
+--- a/src/time/time_test.go
++++ b/src/time/time_test.go
+@@ -943,8 +943,11 @@ func TestLoadFixed(t *testing.T) {
+ 	// 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 e69de29..14031e5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1 @@
+cl-29995--tzdata-2016g.patch

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