[Pkg-golang-commits] [golang-defaults] 01/05: ubuntu changes, mostly that golang-go is available on all platforms
Michael Hudson-Doyle
mwhudson-guest at moszumanska.debian.org
Wed Jul 19 21:48:34 UTC 2017
This is an automated email from the git hooks/post-receive script.
mwhudson-guest pushed a commit to tag 1.7.1ubuntu1
in repository golang-defaults.
commit b6067e180eb8e49a55d2ec032ecdcd6709701081
Author: Michael Hudson-Doyle <michael.hudson at canonical.com>
Date: Tue Jun 14 14:46:18 2016 +1200
ubuntu changes, mostly that golang-go is available on all platforms
---
debian/clean | 2 +-
debian/control | 34 ++++++++++++++++------
...olang-any.links.gccgo => golang-go.links.gccgo} | 0
.../{golang-go.links => golang-go.links.golang-go} | 2 +-
debian/helpers/getgoarches.pl | 2 +-
debian/rules | 6 ++--
6 files changed, 32 insertions(+), 14 deletions(-)
diff --git a/debian/clean b/debian/clean
index c2427f5..10d9423 100644
--- a/debian/clean
+++ b/debian/clean
@@ -1 +1 @@
-debian/golang-any.links
+debian/golang-go.links
diff --git a/debian/control b/debian/control
index 470d885..dbca85a 100644
--- a/debian/control
+++ b/debian/control
@@ -13,9 +13,10 @@ Vcs-Browser: https://anonscm.debian.org/cgit/pkg-golang/golang-defaults.git
Vcs-Git: https://anonscm.debian.org/git/pkg-golang/golang-defaults.git
Package: golang-go
-Architecture: amd64 arm64 armel armhf i386 ppc64 ppc64el s390x
-Depends: golang-${golang:GOVER}-go,
- golang-src (>= ${source:Version}),
+Architecture: any
+Depends: gccgo [!armel !armhf !amd64 !i386 !arm64 !ppc64 !ppc64el !s390x],
+ golang-${golang:GOVER}-go [armel armhf amd64 i386 arm64 ppc64 ppc64el s390x],
+ golang-src (>= ${source:Version}) [armel armhf amd64 i386 arm64 ppc64 ppc64el s390x],
${misc:Depends}
Breaks: gccgo-5 (<< 5.3.1-12~),
gccgo-6 (<< 6-20160319-1~),
@@ -47,6 +48,7 @@ Replaces: golang-go-darwin-386,
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: golang-race-detector-runtime [amd64]
Description: Go programming language compiler, linker, compiled stdlib
The Go programming language is an open source project to make programmers more
productive. Go is expressive, concise, clean, and efficient. Its concurrency
@@ -58,14 +60,15 @@ Description: Go programming language compiler, linker, compiled stdlib
interpreted language.
.
This is a dependency package that depends on the default Go toolchain and
- compiled standard library. It is only built on architectures that have a
- native toolchain ("gc compiler"). Packages that want to build with whichever
- of gc or gccgo is available should depend on golang-any.
+ compiled standard library. It currently depends on gccgo on architectures that
+ do not have a native toolchain ("gc compiler") port but this will change soon
+ -- packages that want to build with whichever of gc or gccgo is available
+ should depend on golang-any.
Package: golang-any
Architecture: any
-Depends: golang-go (>= ${source:Version}) | gccgo-6, ${misc:Depends}
-Description: Go programming language -- gccgo on "non-Go" platforms
+Depends: golang-go, ${misc:Depends}
+Description: Go programming language compiler, linker, compiled stdlib
The Go programming language is an open source project to make programmers more
productive. Go is expressive, concise, clean, and efficient. Its concurrency
mechanisms make it easy to write programs that get the most out of multicore
@@ -126,7 +129,7 @@ Depends: golang-${golang:GOVER},
golang-go (>= ${source:Version}),
golang-src (>= ${source:Version}),
${misc:Depends}
-Architecture: amd64 arm64 armel armhf i386 ppc64 ppc64el s390x
+Architecture: all
Description: Go programming language compiler - metapackage
The Go programming language is an open source project to make
programmers more productive. Go is expressive, concise, clean, and
@@ -140,3 +143,16 @@ Description: Go programming language compiler - metapackage
.
This package is a metapackage that, when installed, guarantees
that (most of) a full Go development environment is installed.
+
+Package: golang-race-detector-runtime
+Architecture: amd64
+Depends: golang-${golang:GOVER}-race-detector-runtime, ${misc:Depends}
+Description: Runtime support for Go's race detector
+ The runtime support for the race detector is included as a binary
+ file in the go source distribution so this package exists to build it
+ from source on trusted infrastructure.
+ .
+ Installing this package will make the -race flag to the go tool functional.
+ .
+ This is a dependency package that depends on the race detector runtime for the
+ default version of Go.
diff --git a/debian/golang-any.links.gccgo b/debian/golang-go.links.gccgo
similarity index 100%
rename from debian/golang-any.links.gccgo
rename to debian/golang-go.links.gccgo
diff --git a/debian/golang-go.links b/debian/golang-go.links.golang-go
similarity index 100%
rename from debian/golang-go.links
rename to debian/golang-go.links.golang-go
index 79b7747..9342dc1 100755
--- a/debian/golang-go.links
+++ b/debian/golang-go.links.golang-go
@@ -1,4 +1,4 @@
#!/usr/bin/dh-exec
-usr/lib/go-${GOVER} usr/lib/go
usr/lib/go-${GOVER}/bin/go usr/bin/go
usr/lib/go-${GOVER}/bin/gofmt usr/bin/gofmt
+usr/lib/go-${GOVER} usr/lib/go
diff --git a/debian/helpers/getgoarches.pl b/debian/helpers/getgoarches.pl
index 4718a0f..28fb668 100755
--- a/debian/helpers/getgoarches.pl
+++ b/debian/helpers/getgoarches.pl
@@ -10,5 +10,5 @@ use strict;
use Dpkg::Control::Info;
my $control = Dpkg::Control::Info->new();
-my $p = $control->get_pkg_by_name('golang-go');
+my $p = $control->get_pkg_by_name('golang-src');
printf("%s\n", $p->{Architecture});
diff --git a/debian/rules b/debian/rules
index f534ecc..39a9930 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,8 +14,10 @@ endif
override_dh_prep:
dh_prep
-ifeq (false, $(IS_GOLANG_ARCH))
- cp debian/golang-any.links.gccgo debian/golang-any.links
+ifeq (true, $(IS_GOLANG_ARCH))
+ cp debian/golang-go.links.golang-go debian/golang-go.links
+else
+ cp debian/golang-go.links.gccgo debian/golang-go.links
endif
override_dh_gencontrol:
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-golang/golang-defaults.git
More information about the pkg-golang-commits
mailing list