[SCM] Packaging for Google Go branch, debian-sid, updated. debian/1%57-1-3-g5812e10

[Ondřej Surý]

The following commit has been merged in the debian-sid branch:
commit 5812e101e73f9ddc13362b4ec775f8a4ae012d3f
Author: Ondřej Surý <ondrej at sury.org>
Date:   Wed May 4 16:26:31 2011 +0200

    Merge some changes from weekly branch

diff --git a/debian/control b/debian/control
index 4d75c0e..69e8737 100644
--- a/debian/control
+++ b/debian/control
@@ -127,3 +127,23 @@ Description: Go programming language tool chain [debug]
  This package provides the debug symbols for the Google's Go tool
  chain binaries (assembler, compiler, linker) needed for properly
  debugging errors in the tool chain with gdb.
+
+Package: golang
+Depends: ${misc:Depends},
+	 golang-go (>= ${source:Version}),
+         golang-src (>= ${source:Version}),
+         golang-tools (>= ${source:Version})
+Architecture: all
+Description: Go programming language [meta package]
+ This package is a metapackage that, when installed, guarantees
+ that (almost) full Go development environment is installed.
+ .
+ The Go programming language is an open source project to make
+ programmers more productive. Go is expressive, concise, clean, and
+ efficient.  Its concurrency mechanisms make it easy to write programs
+ that get the most out of multicore and networked machines, while its
+ novel type system enables flexible and modular program construction.
+ Go compiles quickly to machine code yet has the convenience of
+ garbage collection and the power of run-time reflection.  It's a
+ fast, statically typed, compiled language that feels like a
+ dynamically typed, interpreted language.
diff --git a/debian/golang-go.install b/debian/golang-go.install
index 13645e3..3a1dc54 100644
--- a/debian/golang-go.install
+++ b/debian/golang-go.install
@@ -14,7 +14,6 @@ bin/?c /usr/bin/
 bin/?a /usr/bin/
 bin/?nm /usr/bin/
 bin/?g /usr/bin/
-bin/golang-* /usr/bin/
 src/Make.* /usr/share/go/src/
 src/pkg/runtime/cgocall.h /usr/share/go/src/pkg/runtime/
 src/pkg/runtime/runtime.h /usr/share/go/src/pkg/runtime/
diff --git a/debian/native-symlinks.mk b/debian/native-symlinks.mk
index e6ceaa1..6cbbe2e 100644
--- a/debian/native-symlinks.mk
+++ b/debian/native-symlinks.mk
@@ -4,7 +4,7 @@
 export GOROOT = .
 include src/Make.inc
 
-bindir = debian/golang-go/usr/bin
+bindir = debian/$(PACKAGE)-go/usr/bin
 basenames = a c cov g l nm prof
 
 .PHONY: all
diff --git a/debian/rules b/debian/rules
index ff977b1..8100291 100755
--- a/debian/rules
+++ b/debian/rules
@@ -27,20 +27,17 @@ override_dh_auto_test:
 #	$(no_check) || { cd src && bash ./run.bash --no-rebuild; }
 
 override_dh_compress:
-	dh_compress -Xusr/share/doc/golang-doc/html -Xusr/share/doc/golang-doc/godoc
-
-override_dh_auto_install:
-	for cmd in a c g l; do ln -s $(GOPREFIX)$$cmd $(CURDIR)$(bindir)/golang-$$cmd; done
+	dh_compress -Xusr/share/doc/$(PACKAGE)-doc/html -Xusr/share/doc/$(PACKAGE)-doc/godoc
 
 override_dh_install:
 	dh_install --fail-missing
 	for f in $$(find src/cmd -name doc.go ; find src/pkg -name \*.go); do \
-	  install -D -m 0644 $$f debian/golang-src/$(datadir)/$$f; \
+	  install -D -m 0644 $$f debian/$(PACKAGE)-src/$(datadir)/$$f; \
 	done
-	make -f debian/native-symlinks.mk
+	make -f debian/native-symlinks.mk PACKAGE=$(PACKAGE)
 
 override_dh_strip:
-	dh_strip -X".a" -Xgoinstall -Xgodoc -Xgoyacc -Xbin/cgo -Xebnflint -Xgofmt -Xgovet -Xgotest --dbg-package=golang-dbg
+	dh_strip -X".a" -Xgoinstall -Xgodoc -Xgoyacc -Xbin/cgo -Xebnflint -Xgofmt -Xgovet -Xgotest --dbg-package=$(PACKAGE)-dbg
 
 debian/build.stamp:
 	rm -f debian/build.stamp
@@ -126,16 +123,17 @@ export GOROOT GOROOT_FINAL GOOS GOARCH GOARM GOBIN GOHOSTARCH GOHOSTOS
 
 REPO = https://go.googlecode.com/hg/
 GOLANG_ORIG_DIR = $(CURDIR)/../go
+REV = release
 get-orig-source:
 	-set -e; \
 	if [ ! -d $(GOLANG_ORIG_DIR) ]; then \
-		hg clone -rrelease "$(REPO)" "$(GOLANG_ORIG_DIR)"; \
+		hg clone -r"$(REV)" "$(REPO)" "$(GOLANG_ORIG_DIR)"; \
 	fi
 	cd "$(GOLANG_ORIG_DIR)"; \
 	hg pull; \
-	hg update release; \
-	VERSION=$$(hg identify -t -rrelease | perl -e '<> =~ /release\.r(\d+)/; print "$$1"'); \
-	hg archive -ttgz -p"golang-$$VERSION/" -r"release" -X'.hg*' -X'doc/talks/go_talk-20091030.pdf' "$(CURDIR)/../golang_$$VERSION.orig.tar.gz"; \
-	echo "Now run git-import-orig $(CURDIR)/../golang_$$VERSION.orig.tar.gz"
+	hg update "$(REV)"; \
+	VERSION=$$(hg identify -t -r"$(REV)" | perl -e '<> =~ /$(REV)\.r(\d+)/; print "$$1"'); \
+	hg archive -ttgz -p"$(PACKAGE)-$$VERSION/" -r"$(REV)" -X'.hg*' -X'doc/talks/go_talk-20091030.pdf' "$(CURDIR)/../$(PACKAGE)_$$VERSION.orig.tar.gz"; \
+	echo "Now run git-import-orig $(CURDIR)/../$(PACKAGE)_$$VERSION.orig.tar.gz"
 
 .PHONY: build clean install binary-arch binary-indep binary

-- 
Packaging for Google Go