[Pkg-golang-commits] [golang] 01/01: Add mwhudson to debian/control.in too, and apply some minor tweaks to debian/rules

[Tianon Gravi]

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

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

commit b3e62ea8c32355789fe728ef67d944e0ded82415
Author: Tianon Gravi <tianon at debian.org>
Date:   Wed Jun 1 06:51:26 2016 -0700

    Add mwhudson to debian/control.in too, and apply some minor tweaks to debian/rules
---
 debian/control    | 16 ++++++++--------
 debian/control.in |  9 +++------
 debian/rules      | 12 +++++++++---
 3 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/debian/control b/debian/control
index 49bef9b..5f031c6 100644
--- a/debian/control
+++ b/debian/control
@@ -1,11 +1,15 @@
+#
+# WARNING: "debian/control" is generated via "debian/rules gencontrol" (sourced from "debian/control.in")
+#
+
 Source: golang-1.6
 Section: devel
 Priority: optional
 Maintainer: Go Compiler Team <pkg-golang-devel at lists.alioth.debian.org>
-Uploaders: Michael Hudson-Doyle <michael.hudson at ubuntu.com>,
-           Michael Stapelberg <stapelberg at debian.org>,
+Uploaders: Michael Stapelberg <stapelberg at debian.org>,
            Paul Tagliamonte <paultag at debian.org>,
-           Tianon Gravi <tianon at debian.org>
+           Tianon Gravi <tianon at debian.org>,
+           Michael Hudson-Doyle <michael.hudson at ubuntu.com>
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-golang/golang.git
 Vcs-Git: git://anonscm.debian.org/pkg-golang/golang.git
 Build-Depends: debhelper (>= 7.4.10),
@@ -21,11 +25,7 @@ Depends: golang-1.6-src (>= ${source:Version}),
          ${perl:Depends},
          ${shlibs:Depends}
 Recommends: g++, gcc, libc6-dev, pkg-config
-Suggests: bzr,
-          ca-certificates,
-          git,
-          mercurial,
-          subversion
+Suggests: bzr, ca-certificates, git, 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
diff --git a/debian/control.in b/debian/control.in
index 4a88a9e..2a32431 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -4,7 +4,8 @@ Priority: optional
 Maintainer: Go Compiler Team <pkg-golang-devel at lists.alioth.debian.org>
 Uploaders: Michael Stapelberg <stapelberg at debian.org>,
            Paul Tagliamonte <paultag at debian.org>,
-           Tianon Gravi <tianon at debian.org>
+           Tianon Gravi <tianon at debian.org>,
+           Michael Hudson-Doyle <michael.hudson at ubuntu.com>
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-golang/golang.git
 Vcs-Git: git://anonscm.debian.org/pkg-golang/golang.git
 Build-Depends: debhelper (>= 7.4.10),
@@ -20,11 +21,7 @@ Depends: golang-X.Y-src (>= ${source:Version}),
          ${perl:Depends},
          ${shlibs:Depends}
 Recommends: g++, gcc, libc6-dev, pkg-config
-Suggests: bzr,
-          ca-certificates,
-          git,
-          mercurial,
-          subversion
+Suggests: bzr, ca-certificates, git, 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
diff --git a/debian/rules b/debian/rules
index 84643f6..573fde2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,7 +20,13 @@ endif
 	+dh --parallel $(opt_no_act) $@
 
 gencontrol:
-	sed -e 's/golang-X.Y/golang-$(GOVER)/g' debian/control.in > debian/control
+	{ \
+		echo '#'; \
+		echo '# WARNING: "debian/control" is generated via "debian/rules gencontrol" (sourced from "debian/control.in")'; \
+		echo '#'; \
+		echo; \
+		sed -e 's/golang-X.Y/golang-$(GOVER)/g' debian/control.in; \
+	} > debian/control
 
 override_dh_auto_clean: gencontrol
 	# remove autogenerated files
@@ -31,13 +37,13 @@ override_dh_auto_clean: gencontrol
 		src/runtime/internal/sys/zversion.go
 	# remove built objects
 	rm -rf bin pkg
-	@cd debian; for x in golang-X.Y-*; do \
+	@set -e; cd debian; for x in golang-X.Y-*; do \
 		rm -f -v golang-$(GOVER)-$${x##golang-X.Y-}; \
 	done
 
 override_dh_prep:
 	dh_prep
-	@cd debian; for x in golang-X.Y-*; do \
+	@set -e; cd debian; for x in golang-X.Y-*; do \
 		sed -e 's/X.Y/$(GOVER)/g' $$x > golang-$(GOVER)-$${x##golang-X.Y-}; \
 	done
 

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