Remove don't install deps patch from goinstall; deprecated by $GOPATH installs

3 files changed, 3 insertions, 70 deletions

diff --git a/debian/patches/004-dont_reinstall_dependencies_in_goinstall.patch b/debian/patches/004-dont_reinstall_dependencies_in_goinstall.patch
deleted file mode 100644
index 3cf00e0c5..000000000
--- a/debian/patches/004-dont_reinstall_dependencies_in_goinstall.patch
+++ /dev/null
@@ -1,66 +0,0 @@
---- a/src/cmd/goinstall/main.go
-+++ b/src/cmd/goinstall/main.go
-@@ -21,6 +21,7 @@ import (
- )
- 
- func usage() {
-+	fmt.Fprintf(os.Stderr, "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/go. You have been warned!\n")
- 	fmt.Fprint(os.Stderr, "usage: goinstall importpath...\n")
- 	fmt.Fprintf(os.Stderr, "\tgoinstall -a\n")
- 	flag.PrintDefaults()
-@@ -43,6 +44,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
-@@ -191,7 +193,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
-+			}
- 		}
- 	}
- 
---- 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/go.
-+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,6 +19,7 @@ Usage:
- 
- Flags and default settings:
-         -a=false          install all previously installed packages
-+        -d=false          install all package prerequisites (dangerous on Debian)
- 	-clean=false      clean the package directory before installing
- 	-dashboard=true   tally public packages on godashboard.appspot.com
- 	-log=true         log installed packages to $GOROOT/goinstall.log for use by -a
-@@ -21,9 +27,9 @@ Flags and default settings:
- 	-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 given -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/005-goinstall_dont_call_home_by_default.patch b/debian/patches/005-goinstall_dont_call_home_by_default.patch
index 5fe2bf584..1c438d310 100644
--- a/debian/patches/005-goinstall_dont_call_home_by_default.patch
+++ b/debian/patches/005-goinstall_dont_call_home_by_default.patch
@@ -1,6 +1,6 @@
 --- a/src/cmd/goinstall/main.go
 +++ b/src/cmd/goinstall/main.go
-@@ -39,7 +39,7 @@ var (
+@@ -38,7 +38,7 @@ var (
  	installedPkgs = make(map[string]bool)
  
  	allpkg            = flag.Bool("a", false, "install all previously installed packages")
@@ -11,9 +11,9 @@
  	clean             = flag.Bool("clean", false, "clean the package directory before installing")
 --- a/src/cmd/goinstall/doc.go
 +++ b/src/cmd/goinstall/doc.go
-@@ -21,7 +21,7 @@ Flags and default settings:
+@@ -15,7 +15,7 @@ Usage:
+ Flags and default settings:
          -a=false          install all previously installed packages
-         -d=false          install all package prerequisites (dangerous on Debian)
  	-clean=false      clean the package directory before installing
 -	-dashboard=true   tally public packages on godashboard.appspot.com
 +	-dashboard=false  tally public packages on godashboard.appspot.com
diff --git a/debian/patches/series b/debian/patches/series
index 4b2b2d632..f87072eb7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,5 @@
 001-allow_IPv4_on_IPv6_sockets.patch
 003-set_correct_runpath.patch
-004-dont_reinstall_dependencies_in_goinstall.patch
 005-goinstall_dont_call_home_by_default.patch
 006-fix_kfreebsd_build.patch
 007-use_native_dynamic_linker_on_kfreebsd.patch