[Pkg-golang-commits] [golang] 02/02: Move "go" and "gofmt" into "/usr/lib/go" and use alternatives to provide appropriate symlinks (Closes: #779503, #782301)

[Tianon Gravi]

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

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

commit 5448d99071d9a05fa0541557e8e8277b84303b08
Author: Tianon Gravi <admwiggin at gmail.com>
Date:   Sat May 2 16:47:28 2015 -0600

    Move "go" and "gofmt" into "/usr/lib/go" and use alternatives to provide appropriate symlinks (Closes: #779503, #782301)
---
 debian/changelog          |  7 +++++++
 debian/golang-go.dirs     |  1 -
 debian/golang-go.install  |  4 ++--
 debian/golang-go.postinst | 11 +++++++++--
 4 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1e89388..5b8412a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+golang (2:1.4.2-2) UNRELEASED; urgency=medium
+
+  * Move "go" and "gofmt" into "/usr/lib/go" and use alternatives to provide
+    appropriate symlinks (Closes: #779503, #782301).
+
+ -- Tianon Gravi <admwiggin at gmail.com>  Sat, 02 May 2015 22:39:22 +0000
+
 golang (2:1.4.2-1) unstable; urgency=medium
 
   * New upstream version
diff --git a/debian/golang-go.dirs b/debian/golang-go.dirs
index 33522f9..c560784 100644
--- a/debian/golang-go.dirs
+++ b/debian/golang-go.dirs
@@ -1,3 +1,2 @@
-usr/bin
 usr/lib/go
 usr/share/go/src/
diff --git a/debian/golang-go.install b/debian/golang-go.install
index f0ab2f7..c819e34 100644
--- a/debian/golang-go.install
+++ b/debian/golang-go.install
@@ -1,5 +1,5 @@
-bin/go /usr/bin
-bin/gofmt /usr/bin
+bin/go /usr/lib/go/bin/
+bin/gofmt /usr/lib/go/bin/
 pkg/obj /usr/lib/go/pkg/
 pkg/tool /usr/lib/go/pkg/
 VERSION /usr/lib/go/
diff --git a/debian/golang-go.postinst b/debian/golang-go.postinst
index 2f5bd34..6a6081e 100644
--- a/debian/golang-go.postinst
+++ b/debian/golang-go.postinst
@@ -19,8 +19,15 @@ case "$1" in
 		rm -f $conffile
 		rmdir /etc/golang || true
 	fi
-	# Very ugly hack to set timestamps same as /usr/bin/go
-	find /usr/lib/go/pkg -exec touch -r /usr/bin/go {} \;
+	# Very ugly hack to set timestamps same as /usr/lib/go/bin/go
+	find /usr/lib/go/pkg -exec touch -r /usr/lib/go/bin/go {} \;
+	# Setup alternatives
+	# Priority: base of 100 + go version; 1.4.2 = 100 + 42)
+	go=$(/usr/lib/go/bin/go version | awk '{ gsub(/^go1|[.]/, "", $3); print $3 }')
+	priority=$(( 100 + $go ))
+	update-alternatives \
+		--install /usr/bin/go go /usr/lib/go/bin/go $priority \
+		--slave /usr/bin/gofmt gofmt /usr/lib/go/bin/gofmt
 	;;
     *)
 	;;

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