From: Raspbian automatic forward porter <root@raspbian.org>
Date: Thu, 31 Jan 2019 23:43:38 +0000 (+0000)
Subject: Merge version 1.11.4-4+rpi1 and 1.11.5-1 to produce 1.11.5-1+rpi1
X-Git-Tag: archive/raspbian/1.11.5-1+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=db0d24023deb2f976fceff494c84e7c7fc1a4480;p=golang-1.11.git

Merge version 1.11.4-4+rpi1 and 1.11.5-1 to produce 1.11.5-1+rpi1
---

db0d24023deb2f976fceff494c84e7c7fc1a4480
diff --cc debian/changelog
index 9c073ce,2e88306..59a6ff9
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,8 +1,17 @@@
- golang-1.11 (1.11.4-4+rpi1) buster-staging; urgency=medium
++golang-1.11 (1.11.5-1+rpi1) buster-staging; urgency=medium
 +
 +  [changes brought forward from golang-1.10 1.10~rc2-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sat, 24 Feb 2018 12:22:04 +0000]
 +  * Build with GOARM=6
 +  * Disable testsuite.
 +  * Fix clean target.
 +
-  -- Peter Micheal Green <plugwash@raspbian.org>  Thu, 03 Jan 2019 10:55:36 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 31 Jan 2019 23:43:38 +0000
++
+ golang-1.11 (1.11.5-1) unstable; urgency=high
+ 
+   * New upstream version 1.11.5, fixing CVE-2019-6486
+ 
+  -- Michael Stapelberg <stapelberg@debian.org>  Thu, 24 Jan 2019 08:23:06 +0100
  
  golang-1.11 (1.11.4-4) unstable; urgency=medium