[Pkg-golang-commits] [golang] 01/01: Breaks/Replaces: older golang-golang-x-tools, not Conflicts, to ensure smooth upgrades.

[Michael Hudson-Doyle]

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

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

commit 1c2152afd292c72d4cf206ed6520642d19743a50
Author: Michael Hudson-Doyle <michael.hudson at canonical.com>
Date:   Wed Mar 2 09:57:17 2016 +1300

    Breaks/Replaces: older golang-golang-x-tools, not Conflicts, to ensure smooth upgrades.
---
 debian/changelog |  7 +++++++
 debian/control   | 10 ++++++----
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index eced681..840524a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+golang (2:1.6-2) UNRELEASED; urgency=medium
+
+  * Breaks/Replaces: older golang-golang-x-tools, not Conflicts, to ensure
+    smooth upgrades.
+
+ -- Michael Hudson-Doyle <michael.hudson at canonical.com>  Wed, 02 Mar 2016 09:56:16 +1300
+
 golang (2:1.6-1) unstable; urgency=medium
 
   * Update to 1.6 upstream release (thanks Hilko!)
diff --git a/debian/control b/debian/control
index d54a1c1..d08c525 100644
--- a/debian/control
+++ b/debian/control
@@ -30,7 +30,9 @@ Breaks: golang-go-darwin-386,
         golang-go-netbsd-386,
         golang-go-netbsd-amd64,
         golang-go-windows-386,
-        golang-go-windows-amd64
+        golang-go-windows-amd64,
+        golang-go.tools (<< 1:0.0~git20151026.0.0f9d71c-1~),
+        golang-golang-x-tools (<< 1:0.0~git20151026.0.0f9d71c-1~)
 Replaces: golang-go-darwin-386,
           golang-go-darwin-amd64,
           golang-go-freebsd-386,
@@ -42,9 +44,9 @@ Replaces: golang-go-darwin-386,
           golang-go-netbsd-386,
           golang-go-netbsd-amd64,
           golang-go-windows-386,
-          golang-go-windows-amd64
-Conflicts: golang-go.tools (<< 1:0.0~git20151026.0.0f9d71c-1~),
-           golang-golang-x-tools (<< 1:0.0~git20151026.0.0f9d71c-1~)
+          golang-go-windows-amd64,
+          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