[SCM] Packaging for Google Go branch, weekly-debian-sid, updated. debian-weekly/2011.06.09-2-25-gbd93d2f

[Ondřej Surý]

The following commit has been merged in the weekly-debian-sid branch:
commit 521c1a2d4aaf7efe26067f9019e8f53b86865722
Author: Ondřej Surý <ondrej at sury.org>
Date:   Wed Aug 3 17:31:24 2011 +0200

    Refresh patches for new weekly release

diff --git a/debian/patches/005-goinstall_dont_call_home_by_default.patch b/debian/patches/005-goinstall_dont_call_home_by_default.patch
index 287e662..b0866a5 100644
--- a/debian/patches/005-goinstall_dont_call_home_by_default.patch
+++ b/debian/patches/005-goinstall_dont_call_home_by_default.patch
@@ -1,14 +1,14 @@
 --- a/src/cmd/goinstall/main.go
 +++ b/src/cmd/goinstall/main.go
-@@ -35,7 +35,7 @@ var (
- 	installedPkgs = make(map[string]bool)
+@@ -38,7 +38,7 @@ var (
+ 	schemeRe      = regexp.MustCompile(`^[a-z]+://`)
  
  	allpkg            = flag.Bool("a", false, "install all previously installed packages")
 -	reportToDashboard = flag.Bool("dashboard", true, "report public packages at "+dashboardURL)
 +	reportToDashboard = flag.Bool("dashboard", false, "report public packages at "+dashboardURL)
- 	logPkgs           = flag.Bool("log", true, "log installed packages to $GOROOT/goinstall.log for use by -a")
  	update            = flag.Bool("u", false, "update already-downloaded packages")
  	doInstall         = flag.Bool("install", true, "build and install")
+ 	clean             = flag.Bool("clean", false, "clean the package directory before installing")
 --- a/src/cmd/goinstall/doc.go
 +++ b/src/cmd/goinstall/doc.go
 @@ -15,7 +15,7 @@ Usage:
@@ -18,5 +18,5 @@
 -	-dashboard=true   tally public packages on godashboard.appspot.com
 +	-dashboard=false  tally public packages on godashboard.appspot.com
  	-install=true     build and install the package and its dependencies
- 	-log=true         log installed packages to $GOROOT/goinstall.log for use by -a
  	-nuke=false       remove the target object and clean before installing
+ 	-u=false          update already-downloaded packages
diff --git a/debian/patches/007-use_native_dynamic_linker_on_kfreebsd.patch b/debian/patches/007-use_native_dynamic_linker_on_kfreebsd.patch
index c86dda6..fec8c59 100644
--- a/debian/patches/007-use_native_dynamic_linker_on_kfreebsd.patch
+++ b/debian/patches/007-use_native_dynamic_linker_on_kfreebsd.patch
@@ -17,6 +17,6 @@
  char linuxdynld[] = "/lib64/ld-linux-x86-64.so.2";
 -char freebsddynld[] = "/libexec/ld-elf.so.1";
 +char freebsddynld[] = "/lib/ld-kfreebsd-x86-64.so.1";
+ char openbsddynld[] = "/usr/libexec/ld.so";
  
  char	zeroes[32];
- 
diff --git a/debian/patches/009-goinstall_can_install_to_GOPATH.patch b/debian/patches/009-goinstall_can_install_to_GOPATH.patch
index 5451d93..b2d3502 100644
--- a/debian/patches/009-goinstall_can_install_to_GOPATH.patch
+++ b/debian/patches/009-goinstall_can_install_to_GOPATH.patch
@@ -1,17 +1,8 @@
 --- a/src/cmd/goinstall/main.go
 +++ b/src/cmd/goinstall/main.go
-@@ -36,7 +36,7 @@ var (
- 
- 	allpkg            = flag.Bool("a", false, "install all previously installed packages")
- 	reportToDashboard = flag.Bool("dashboard", false, "report public packages at "+dashboardURL)
--	logPkgs           = flag.Bool("log", true, "log installed packages to $GOROOT/goinstall.log for use by -a")
-+	logPkgs           = flag.Bool("log", false, "log installed packages to $GOROOT/goinstall.log for use by -a")
- 	update            = flag.Bool("u", false, "update already-downloaded packages")
- 	doInstall         = flag.Bool("install", true, "build and install")
- 	clean             = flag.Bool("clean", false, "clean the package directory before installing")
-@@ -77,6 +77,10 @@ func main() {
- 		os.Exit(1)
+@@ -80,6 +80,10 @@ func main() {
  	}
+ 	readPackageList()
  
 +	if os.Getuid() != 0 && os.Getenv("GOPATH") == "" {
 +		fmt.Fprintf(os.Stderr, "%s: set $GOPATH to the directory you want packages installed to if you get permission denied error\n", argv0)
@@ -20,14 +11,3 @@
  	// special case - "unsafe" is already installed
  	visit["unsafe"] = done
  
---- a/src/cmd/goinstall/doc.go
-+++ b/src/cmd/goinstall/doc.go
-@@ -17,7 +17,7 @@ Flags and default settings:
- 	-clean=false      clean the package directory before installing
- 	-dashboard=false  tally public packages on godashboard.appspot.com
- 	-install=true     build and install the package and its dependencies
--	-log=true         log installed packages to $GOROOT/goinstall.log for use by -a
-+	-log=false        log installed packages to $GOROOT/goinstall.log for use by -a
- 	-nuke=false       remove the target object and clean before installing
- 	-u=false          update already-downloaded packages
- 	-v=false          verbose operation

-- 
Packaging for Google Go