[Pkg-golang-commits] [golang] 01/01: Generate "gbp.conf" contents as well

[Tianon Gravi]

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

tianon pushed a commit to branch golang-1.6
in repository golang.

commit 85ec504d65a64326baa2190a07739354c994b8fa
Author: Tianon Gravi <admwiggin at gmail.com>
Date:   Mon Jul 11 08:17:38 2016 -0700

    Generate "gbp.conf" contents as well
---
 debian/gbp.conf                  | 6 ++++--
 debian/{gbp.conf => gbp.conf.in} | 4 ++--
 debian/rules                     | 5 +++++
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/debian/gbp.conf b/debian/gbp.conf
index ed92c52..14c3113 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,7 +1,9 @@
+# WARNING: "debian/gbp.conf" is generated via "debian/rules gencontrol" (sourced from "debian/gbp.conf.in")
+
 [DEFAULT]
-debian-branch = debian-sid
+debian-branch = golang-1.6
 debian-tag = debian/%(version)s
-upstream-branch = upstream-sid
+upstream-branch = upstream-1.6
 upstream-tag = upstream/%(version)s
 pristine-tar = True
 
diff --git a/debian/gbp.conf b/debian/gbp.conf.in
similarity index 67%
copy from debian/gbp.conf
copy to debian/gbp.conf.in
index ed92c52..687c798 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf.in
@@ -1,7 +1,7 @@
 [DEFAULT]
-debian-branch = debian-sid
+debian-branch = golang-X.Y
 debian-tag = debian/%(version)s
-upstream-branch = upstream-sid
+upstream-branch = upstream-X.Y
 upstream-tag = upstream/%(version)s
 pristine-tar = True
 
diff --git a/debian/rules b/debian/rules
index 573fde2..516cae3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -27,6 +27,11 @@ gencontrol:
 		echo; \
 		sed -e 's/golang-X.Y/golang-$(GOVER)/g' debian/control.in; \
 	} > debian/control
+	{ \
+		echo '# WARNING: "debian/gbp.conf" is generated via "debian/rules gencontrol" (sourced from "debian/gbp.conf.in")'; \
+		echo; \
+		sed -e 's/X\.Y/$(GOVER)/g' debian/gbp.conf.in; \
+	} > debian/gbp.conf
 
 override_dh_auto_clean: gencontrol
 	# remove autogenerated files

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