[SCM] Packaging for Google Go branch, debian-sid, updated. debian/1%58.1-2-25-ga6bb7fb

[Ondřej Surý]

The following commit has been merged in the debian-sid branch:
commit 204b5729779da919562e564152580d18c6864b8f
Author: Ondřej Surý <ondrej at sury.org>
Date:   Tue Sep 13 13:45:54 2011 +0200

    Refresh patches for new release

diff --git a/debian/patches/006-fix_kfreebsd_build.patch b/debian/patches/006-fix_kfreebsd_build.patch
index e5be030..9399516 100644
--- a/debian/patches/006-fix_kfreebsd_build.patch
+++ b/debian/patches/006-fix_kfreebsd_build.patch
@@ -89,12 +89,12 @@
  	echo 'enum {'
 --- a/src/pkg/net/Makefile
 +++ b/src/pkg/net/Makefile
-@@ -36,7 +36,7 @@ GOFILES_freebsd=\
- 	sock_bsd.go\
+@@ -43,7 +43,7 @@ GOFILES_freebsd=\
  
+ ifeq ($(CGO_ENABLED),1)
  CGOFILES_freebsd=\
 -	cgo_bsd.go\
 +	cgo_linux.go\
- 	cgo_unix.go\
- 
- GOFILES_darwin=\
+ 	cgo_unix.go
+ else
+ GOFILES_freebsd+=cgo_stub.go
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 254f614..37e649e 100644
--- a/debian/patches/009-goinstall_can_install_to_GOPATH.patch
+++ b/debian/patches/009-goinstall_can_install_to_GOPATH.patch
@@ -1,8 +1,8 @@
 --- a/src/cmd/goinstall/main.go
 +++ b/src/cmd/goinstall/main.go
-@@ -77,6 +77,10 @@ func main() {
- 		os.Exit(1)
+@@ -87,6 +87,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)
diff --git a/debian/patches/010-goinstall_check_conf.patch b/debian/patches/010-goinstall_check_conf.patch
index 4d1f199..d7e22e9 100644
--- a/debian/patches/010-goinstall_check_conf.patch
+++ b/debian/patches/010-goinstall_check_conf.patch
@@ -1,15 +1,15 @@
 --- 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 *bool
- 	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")
-@@ -45,6 +45,16 @@ var (
+ 	clean             = flag.Bool("clean", false, "clean the package directory before installing")
+@@ -47,6 +47,16 @@ var (
  	verbose           = flag.Bool("v", false, "verbose")
  )
  

-- 
Packaging for Google Go