[Pkg-golang-commits] [golang] 01/01: Add Conflicts to force newer golang-golang-x-tools (Closes: #802945)

[Tianon Gravi]

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

tianon pushed a commit to branch debian-sid
in repository golang.

commit fd8eb06aa9d6c22c15bb2f0a2e77cb483f4b704e
Author: Tianon Gravi <tianon at debian.org>
Date:   Mon Oct 26 15:56:20 2015 -0700

    Add Conflicts to force newer golang-golang-x-tools (Closes: #802945)
---
 debian/changelog | 6 ++++++
 debian/control   | 1 +
 2 files changed, 7 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index f343daf..f859d8c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+golang (2:1.5.1-2) UNRELEASED; urgency=medium
+
+  * Add Conflicts to force newer golang-golang-x-tools (Closes: #802945).
+
+ -- Tianon Gravi <tianon at debian.org>  Mon, 26 Oct 2015 15:55:20 -0700
+
 golang (2:1.5.1-1) unstable; urgency=medium
 
   * Upload to unstable.
diff --git a/debian/control b/debian/control
index dd82625..8bf3208 100644
--- a/debian/control
+++ b/debian/control
@@ -35,6 +35,7 @@ Replaces: golang-go-darwin-386,
           golang-go-netbsd-amd64,
           golang-go-windows-386,
           golang-go-windows-amd64
+Conflicts: golang-golang-x-tools (<< 1:0.0~git20151026.0.0f9d71c-1~)
 Recommends: g++, gcc, libc6-dev, pkg-config
 Suggests: bzr, ca-certificates, git, golang-golang-x-tools, mercurial, subversion
 Description: Go programming language compiler, linker, compiled stdlib

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