[SCM] Packaging for Google Go branch, debian-sid, updated. debian/2011.02.01.1-1-13-g5e92cf4

[Ondřej Surý]

The following commit has been merged in the debian-sid branch:
commit 2ab91c2f2b350f0442e12dbb1b780de4774a22c9
Author: Ondřej Surý <ondrej at sury.org>
Date:   Fri Feb 18 15:28:40 2011 +0100

    Modify goinstall to not automatically install dependencies

diff --git a/debian/README.Debian b/debian/README.Debian
new file mode 100644
index 0000000..5eb699d
--- /dev/null
+++ b/debian/README.Debian
@@ -0,0 +1,9 @@
+ == Installation of additional packages with goinstall ==
+
+Debian's goinstall was modified to not install dependencies by
+default, because it tries to recompile system libraries, which fails.
+If you want to use goinstall you are probably better using golang-go
+installed in your home, because goinstall is not very FHS friendly
+now.
+
+ -- Ondřej Surý <ondrej at debian.org>, Fri, 18 Feb 2011 15:38:47 +0100
diff --git a/debian/patches/004-dont_reinstall_dependencies_in_goinstall.patch b/debian/patches/004-dont_reinstall_dependencies_in_goinstall.patch
new file mode 100644
index 0000000..a4690f8
--- /dev/null
+++ b/debian/patches/004-dont_reinstall_dependencies_in_goinstall.patch
@@ -0,0 +1,57 @@
+--- a/src/cmd/goinstall/main.go
++++ b/src/cmd/goinstall/main.go
+@@ -43,6 +43,7 @@ var (
+ 	update            = flag.Bool("u", false, "update already-downloaded packages")
+ 	clean             = flag.Bool("clean", false, "clean the package directory before installing")
+ 	verbose           = flag.Bool("v", false, "verbose")
++	installDeps       = flag.Bool("d", false, "install package prerequisites")
+ )
+ 
+ type status int // status for visited map
+@@ -189,7 +190,11 @@ func install(pkg, parent string) {
+ 	}
+ 	for _, p := range dirInfo.imports {
+ 		if p != "C" {
+-			install(p, pkg)
++			if *installDeps {
++				install(p, pkg)
++			} else {
++				visit[p] = done
++			}
+ 		}
+ 	}
+ 	if dirInfo.pkgName == "main" {
+--- a/src/cmd/goinstall/doc.go
++++ b/src/cmd/goinstall/doc.go
+@@ -4,6 +4,11 @@
+ 
+ /*
+ 
++WARNING: Usage of goinstall is highly discouraged on Debian system.
++goinstall is not FHS friendly and it will possibly overwrite files
++from the package creating a highly unstable mess in /usr/lib/golang.
++You have been warned!
++
+ Goinstall is an experiment in automatic package installation.
+ It installs packages, possibly downloading them from the internet.
+ It maintains a list of public Go packages at http://godashboard.appspot.com/package.
+@@ -14,15 +19,16 @@ Usage:
+ 
+ Flags and default settings:
+         -a=false          install all previously installed packages
++        -d=false          install all package prerequisites (dangerous on Debian)
+ 	-dashboard=true   tally public packages on godashboard.appspot.com
+ 	-log=true         log installed packages to $GOROOT/goinstall.log for use by -a
+ 	-u=false          update already-downloaded packages
+ 	-v=false          verbose operation
+ 
+ Goinstall installs each of the packages identified on the command line.  It
+-installs a package's prerequisites before trying to install the package
+-itself. Unless -log=false is specified, goinstall logs the import path of each
+-installed package to $GOROOT/goinstall.log for use by goinstall -a.
++installs a package's prerequisites if give -d=true before trying to install
++the package itself. Unless -log=false is specified, goinstall logs the import
++path of each installed package to $GOROOT/goinstall.log for use by goinstall -a.
+ 
+ If the -a flag is given, goinstall reinstalls all previously installed
+ packages, reading the list from $GOROOT/goinstall.log.  After updating to a
diff --git a/debian/patches/series b/debian/patches/series
index 144de93..d98e1fd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 001-allow_IPv4_on_IPv6_sockets.patch
 002-use_GOROOT_FINAL_in_generated_binaries.patch
 003-set_correct_runpath.patch
+004-dont_reinstall_dependencies_in_goinstall.patch

-- 
Packaging for Google Go