[Pkg-golang-commits] [golang] 01/01: Add Conflicts to force newer golang-go.tools too (Closes: #803559)

[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 2d7d51eb146529c71cee0740e6923e022fb85ab6
Author: Tianon Gravi <tianon at debian.org>
Date:   Tue Nov 3 21:21:56 2015 -0800

    Add Conflicts to force newer golang-go.tools too (Closes: #803559)
---
 debian/changelog | 6 ++++++
 debian/control   | 3 ++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index c5df5af..cee547c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+golang (2:1.5.1-4) UNRELEASED; urgency=medium
+
+  * Add Conflicts to force newer golang-go.tools too (Closes: #803559)
+
+ -- Tianon Gravi <tianon at debian.org>  Tue, 03 Nov 2015 21:20:17 -0800
+
 golang (2:1.5.1-3) unstable; urgency=medium
 
   * Remove architecture qualification on golang-go Build-Depend now that
diff --git a/debian/control b/debian/control
index 68595d8..03fa8b1 100644
--- a/debian/control
+++ b/debian/control
@@ -35,7 +35,8 @@ 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~)
+Conflicts: golang-go.tools (<< 1:0.0~git20151026.0.0f9d71c-1~),
+           golang-golang-x-tools (<< 1:0.0~git20151026.0.0f9d71c-1~)
 Recommends: g++, gcc, libc6-dev, pkg-config
 Suggests: bzr,
           ca-certificates,

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