[Pkg-golang-commits] [golang] 02/15: - Do not distribute un-built from source race detector runtime files and recommend golang-race-detector-runtime instead (see Debian bug #807455).

[Michael Hudson-Doyle]

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

mwhudson-guest pushed a commit to branch ubuntu-trusty-golang-1.6
in repository golang.

commit 7ab51a2b2edb0daf7f2074e393b2f07c02d08228
Author: Michael Hudson-Doyle <michael.hudson at canonical.com>
Date:   Fri Feb 12 10:14:48 2016 +1300

        - Do not distribute un-built from source race detector runtime files and recommend golang-race-detector-runtime instead (see Debian bug #807455).
---
 debian/control | 3 ++-
 debian/rules   | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index b64710d..1a3882c 100644
--- a/debian/control
+++ b/debian/control
@@ -46,7 +46,8 @@ Replaces: golang-go-darwin-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~)
-Recommends: g++, gcc, libc6-dev, pkg-config
+Recommends: g++, gcc, libc6-dev, pkg-config,
+            golang-race-detector-runtime [amd64]
 Suggests: bzr,
           ca-certificates,
           git,
diff --git a/debian/rules b/debian/rules
index 56f4035..19e18dc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -65,6 +65,9 @@ override_dh_install-indep:
 override_dh_install-arch:
 ifeq (true, $(IS_GOLANG_ARCH))
 	dh_install --fail-missing
+	# Remove .syso files of the race detector; they are binary files that
+	# are not built from source in the go source distribution.
+	find $(CURDIR)/debian/golang-src/usr/share/go/src/runtime/race -type f -name '*.syso' -delete
 	# Remove Plan9 rc(1) scripts
 	find debian/golang-src/usr/share/go/src -type f -name '*.rc' -delete
 	# Remove empty /usr/share/go/src from golang-go, it is provided by golang-src

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