[Pkg-golang-commits] [golang-defaults] 01/01: simplify golang-any dependencies and links

[Michael Hudson-Doyle]

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

mwhudson-guest pushed a commit to branch master
in repository golang-defaults.

commit df19159179db07051cb0e81795d48615eaa1e326
Author: Michael Hudson-Doyle <michael.hudson at canonical.com>
Date:   Fri Apr 29 15:03:56 2016 +1200

    simplify golang-any dependencies and links
---
 debian/control                | 4 +---
 debian/golang-any.links.gccgo | 5 ++---
 debian/golang-go.links        | 0
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/debian/control b/debian/control
index 1a452ba..87fb3bf 100644
--- a/debian/control
+++ b/debian/control
@@ -61,9 +61,7 @@ Description: Go programming language compiler, linker, compiled stdlib
 
 Package: golang-any
 Architecture: any
-Depends: gccgo [!armel !armhf !amd64 !i386 !arm64 !ppc64 !ppc64el],
-         golang-go [armel armhf amd64 i386 arm64 ppc64 ppc64el],
-         ${misc:Depends}
+Depends: golang-go (>= ${source:Version}) | gccgo-6, ${misc:Depends}
 Description: Go programming language -- gccgo on "non-Go" platforms
  The Go programming language is an open source project to make programmers more
  productive. Go is expressive, concise, clean, and efficient. Its concurrency
diff --git a/debian/golang-any.links.gccgo b/debian/golang-any.links.gccgo
index fdbb5f1..84aa6f8 100755
--- a/debian/golang-any.links.gccgo
+++ b/debian/golang-any.links.gccgo
@@ -1,3 +1,2 @@
-#!/usr/bin/dh-exec
-usr/bin/go-5 usr/bin/go
-usr/bin/gofmt-5 usr/bin/gofmt
+usr/bin/go-6 usr/bin/go
+usr/bin/gofmt-6 usr/bin/gofmt
diff --git a/debian/golang-go.links b/debian/golang-go.links
old mode 100755
new mode 100644

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