summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOndřej Surý <ondrej@sury.org>2011-04-26 09:59:24 +0200
committerOndřej Surý <ondrej@sury.org>2011-04-26 09:59:41 +0200
commitfe2b1433c90e48348adb350a8ed688f059d31d8c (patch)
tree0382545a7e565c7af625e9f761c36ab6632681d4
parentf922543f951007d312e03c0869b46b60b62f9c78 (diff)
downloadgolang-fe2b1433c90e48348adb350a8ed688f059d31d8c.tar.gz
Update patches to new weekly release
-rw-r--r--debian/patches/004-dont_reinstall_dependencies_in_goinstall.patch7
-rw-r--r--debian/patches/005-goinstall_dont_call_home_by_default.patch6
2 files changed, 7 insertions, 6 deletions
diff --git a/debian/patches/004-dont_reinstall_dependencies_in_goinstall.patch b/debian/patches/004-dont_reinstall_dependencies_in_goinstall.patch
index 838bbf458..7752e210f 100644
--- a/debian/patches/004-dont_reinstall_dependencies_in_goinstall.patch
+++ b/debian/patches/004-dont_reinstall_dependencies_in_goinstall.patch
@@ -43,21 +43,22 @@
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:
+@@ -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
- -u=false update already-downloaded packages
+@@ -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 give -d=true before trying to install
++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.
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 298559b2b..5fe2bf584 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
-@@ -38,7 +38,7 @@ var (
+@@ -39,7 +39,7 @@ var (
installedPkgs = make(map[string]bool)
allpkg = flag.Bool("a", false, "install all previously installed packages")
@@ -11,10 +11,10 @@
clean = flag.Bool("clean", false, "clean the package directory before installing")
--- a/src/cmd/goinstall/doc.go
+++ b/src/cmd/goinstall/doc.go
-@@ -20,7 +20,7 @@ Usage:
- Flags and default settings:
+@@ -21,7 +21,7 @@ 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
-log=true log installed packages to $GOROOT/goinstall.log for use by -a