[Pkg-golang-commits] [golang] 01/03: Remove workaround for now fixed debhelper bug #879762
Michael Hudson-Doyle
mwhudson-guest at moszumanska.debian.org
Mon Oct 30 23:44:20 UTC 2017
This is an automated email from the git hooks/post-receive script.
mwhudson-guest pushed a commit to branch golang-1.9
in repository golang.
commit 3371f166d15b3c96a71cf19f35a7e459963ccb3c
Author: Michael Hudson-Doyle <michael.hudson at canonical.com>
Date: Tue Oct 31 11:09:15 2017 +1300
Remove workaround for now fixed debhelper bug #879762
This reverts commit 6f5c8784abb33cfd3102fc1560de0029f0385ae8.
---
debian/control | 1 +
debian/gbp.conf | 1 +
debian/rules | 1 +
debian/source/lintian-overrides | 1 +
debian/watch | 1 +
5 files changed, 5 insertions(+)
diff --git a/debian/control b/debian/control
index 42f51af..982f618 100644
--- a/debian/control
+++ b/debian/control
@@ -1,6 +1,7 @@
#
# WARNING: "debian/control" is generated via "debian/rules gencontrol" (sourced from "debian/control.in")
#
+
Source: golang-1.9
Section: devel
Priority: optional
diff --git a/debian/gbp.conf b/debian/gbp.conf
index 12958c5..cb9cbf8 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,6 +1,7 @@
#
# WARNING: "debian/gbp.conf" is generated via "debian/rules gencontrol" (sourced from "debian/gbp.conf.in")
#
+
[DEFAULT]
debian-branch = golang-1.9
debian-tag = debian/%(version)s
diff --git a/debian/rules b/debian/rules
index 09009ca..1f31c97 100755
--- a/debian/rules
+++ b/debian/rules
@@ -27,6 +27,7 @@ gencontrol:
echo '#'; \
echo '# WARNING: "debian/'$$file'" is generated via "debian/rules gencontrol" (sourced from "debian/'$$file'.in")'; \
echo '#'; \
+ echo; \
sed -e 's/X.Y/$(GOVER)/g' debian/$$file.in; \
} > debian/$$file; \
done
diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
index 02b700f..fdb7d65 100644
--- a/debian/source/lintian-overrides
+++ b/debian/source/lintian-overrides
@@ -1,6 +1,7 @@
#
# WARNING: "debian/source/lintian-overrides" is generated via "debian/rules gencontrol" (sourced from "debian/source/lintian-overrides.in")
#
+
golang-1.9 source: source-contains-prebuilt-binary src/debug/dwarf/testdata/typedef.elf
golang-1.9 source: source-contains-prebuilt-binary src/debug/elf/testdata/gcc-amd64-linux-exec
golang-1.9 source: source-contains-prebuilt-binary src/debug/elf/testdata/go-relocation-test-gcc441-x86.obj
diff --git a/debian/watch b/debian/watch
index dfdffd8..fe856a8 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,6 +1,7 @@
#
# WARNING: "debian/watch" is generated via "debian/rules gencontrol" (sourced from "debian/watch.in")
#
+
version=3
opts=\
uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha)\d*)$/$1~$2/,\
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-golang/golang.git
More information about the pkg-golang-commits
mailing list