[Pkg-golang-commits] [golang] 11/15: update rules

[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 4b3438eb89a4e17ea1dd00a639f558d24906d56b
Author: Michael Hudson-Doyle <michael.hudson at canonical.com>
Date:   Tue Mar 1 12:47:06 2016 +1300

    update rules
---
 debian/rules | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/debian/rules b/debian/rules
index 6acb71e..deaa6d6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -67,14 +67,14 @@ 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
+	find $(CURDIR)/debian/golang-1.6-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
+	find debian/golang-1.6-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
-	find debian/golang-go/usr/share/go/src -type d -delete
+	find debian/golang-1.6-go/usr/share/go/src -type d -delete
 	# Touch built and installed files and directories to have same timestamp
-	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 {} \;
+	touch debian/golang-1.6-go/usr/lib/go/pkg
+	find debian/golang-1.6-go/usr/lib/go/pkg -exec touch -r $(CURDIR)/debian/golang-1.6-go/usr/lib/go/pkg {} \;
 endif
 
 override_dh_strip:
@@ -85,11 +85,11 @@ override_dh_installdeb:
 	dh_installdeb
 ifeq (false, $(IS_GOLANG_ARCH))
 	: # these are empty dependency packages
-	rm -f debian/golang-go/DEBIAN/p*
-	rm -rf debian/golang-go/usr/share/man
-	install -d -m 755 debian/golang-src/usr/share/go/src
-	install -d -m 755 debian/golang-src/usr/share/go/include
-	install -d -m 755 debian/golang-src/usr/share/go/test
+	rm -f debian/golang-1.6-go/DEBIAN/p*
+	rm -rf debian/golang-1.6-go/usr/share/man
+	install -d -m 755 debian/golang-1.6-src/usr/share/go/src
+	install -d -m 755 debian/golang-1.6-src/usr/share/go/include
+	install -d -m 755 debian/golang-1.6-src/usr/share/go/test
 endif
 
 override_dh_shlibdeps:

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