[Pkg-golang-commits] [golang] 01/01: Resync diff with unstable upload

[Tianon Gravi]

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

tianon pushed a commit to branch debian-experimental
in repository golang.

commit 2a3536e815c4e1eacfbbbf92d1e18b1c18742dad
Author: Tianon Gravi <tianon at debian.org>
Date:   Wed Sep 30 10:25:22 2015 -0700

    Resync diff with unstable upload
---
 debian/changelog | 9 +++++++++
 debian/control   | 4 +---
 debian/rules     | 8 ++++----
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index fea95a6..35c6dda 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,15 @@ golang (2:1.5.1-1~exp2) UNRELEASED; urgency=medium
 
  -- Tianon Gravi <tianon at debian.org>  Sat, 26 Sep 2015 09:10:47 -0700
 
+golang (2:1.4.3-2) unstable; urgency=medium
+
+  * Update Recommends/Suggests, especially to add gcc, etc.
+  * Refactor "debian/rules" to utilize debhelper more effectively, especially
+    for arch vs indep building (mostly backported from the 1.5+ changes), which
+    fixes the "arch:all" FTBFS.
+
+ -- Tianon Gravi <tianon at debian.org>  Sun, 27 Sep 2015 22:06:07 -0700
+
 golang (2:1.5.1-1~exp1) experimental; urgency=low
 
   * Upload to experimental.
diff --git a/debian/control b/debian/control
index 3c4c8c2..c8bf252 100644
--- a/debian/control
+++ b/debian/control
@@ -36,7 +36,7 @@ Replaces: golang-go-darwin-386,
           golang-go-windows-386,
           golang-go-windows-amd64
 Recommends: g++, gcc, libc6-dev, pkg-config
-Suggests: bzr, ca-certificates, git, golang-go.tools, mercurial, subversion
+Suggests: bzr, ca-certificates, git, golang-golang-x-tools, mercurial, subversion
 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
@@ -54,8 +54,6 @@ Description: Go programming language compiler, linker, compiled stdlib
  pre-compile the standard library inside GOROOT for cross-compilation to work.
 
 Package: golang-src
-Replaces: golang-go (<< 2:1-3~)
-Breaks: golang-go (<< 2:1-3~)
 Architecture: amd64 arm64 armel armhf i386 ppc64 ppc64el
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: Go programming language - source files
diff --git a/debian/rules b/debian/rules
index f587ab1..fb8f131 100755
--- a/debian/rules
+++ b/debian/rules
@@ -28,6 +28,9 @@ override_dh_auto_test-arch:
 override_dh_compress-indep:
 	dh_compress -Xusr/share/doc/golang-doc/html -Xusr/share/doc/golang-doc/godoc
 
+override_dh_install-indep:
+	dh_install --fail-missing
+
 override_dh_install-arch:
 	dh_install --fail-missing
 	# Remove Plan9 rc(1) scripts
@@ -38,9 +41,6 @@ override_dh_install-arch:
 	touch debian/golang-go/usr/lib/go/pkg
 	find debian/golang-go/usr/lib/go/pkg -exec touch -r $(CURDIR)/debian/golang-go/usr/lib/go/pkg {} \;
 
-override_dh_install-indep:
-	dh_install --fail-missing
-
 override_dh_strip:
 	# strip disabled as golang upstream doesn't support it and it makes go
 	# crash. See http://bugs.debian.org/717172
@@ -57,5 +57,5 @@ override_dh_auto_build-arch:
 
 opt_no_act :=
 ifneq (,$(findstring n,$(MAKEFLAGS)))
-opt_no_act := --no-act
+	opt_no_act := --no-act
 endif

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