New upstream version 0.0~git20190811.3953808

Author: toddy15

main.go

@@ -13,16 +13,20 @@ var (
 )
 
 func usage() {
-	fmt.Fprintf(os.Stderr, "Usage: %s [globalflags] <command> [flags] <args>\n", os.Args[0])
+	fmt.Fprintf(os.Stderr, "%s is a tool that converts Go packages into Debian package source.\n", os.Args[0])
+	fmt.Fprintf(os.Stderr, "\n")
+	fmt.Fprintf(os.Stderr, "Usage:\n\t%s [globalflags] <command> [flags] <args>\n", os.Args[0])
 	fmt.Fprintf(os.Stderr, "\n")
 	fmt.Fprintf(os.Stderr, "%s commands:\n", os.Args[0])
 	fmt.Fprintf(os.Stderr, "\tmake\t\t\tcreate a Debian package\n")
 	fmt.Fprintf(os.Stderr, "\tsearch\t\t\tsearch Debian for already-existing packages\n")
 	fmt.Fprintf(os.Stderr, "\testimate\t\testimate the amount of work for a package\n")
 	fmt.Fprintf(os.Stderr, "\tcreate-salsa-project\tcreate a project for hosting Debian packaging\n")
 	fmt.Fprintf(os.Stderr, "\n")
-	fmt.Fprintf(os.Stderr, "For backwards compatibility, when no command is specified, the make command is executed.\n")
-	fmt.Fprintf(os.Stderr, "To learn more about a command, run %s <command> -help, e.g. %s make -help\n", os.Args[0], os.Args[0])
+	fmt.Fprintf(os.Stderr, "For backwards compatibility, when no command is specified,\nthe make command is executed.\n")
+	fmt.Fprintf(os.Stderr, "\n")
+	fmt.Fprintf(os.Stderr, "To learn more about a command, run \"%s <command> -help\",\ne.g. \"%s make -help\"\n", os.Args[0], os.Args[0])
+	fmt.Fprintf(os.Stderr, "\n")
 }
 
 func main() {

make.go

@@ -481,12 +481,12 @@ func writeTemplates(dir, gopkg, debsrc, debbin, debversion, pkgType string, depe
 	}
 	defer f.Close()
 	fmt.Fprintf(f, "Source: %s\n", debsrc)
+	fmt.Fprintf(f, "Maintainer: Debian Go Packaging Team <[email protected]>\n")
+	fmt.Fprintf(f, "Uploaders:\n %s <%s>,\n", getDebianName(), getDebianEmail())
 	// TODO: change this once we have a “golang” section.
 	fmt.Fprintf(f, "Section: devel\n")
+	fmt.Fprintf(f, "Testsuite: autopkgtest-pkg-go\n")
 	fmt.Fprintf(f, "Priority: optional\n")
-	fmt.Fprintf(f, "Maintainer: Debian Go Packaging Team <[email protected]>\n")
-	fmt.Fprintf(f, "Uploaders:\n %s <%s>,\n", getDebianName(), getDebianEmail())
-	fmt.Fprintf(f, "Rules-Requires-Root: no\n")
 	builddeps := []string{"debhelper-compat (= 12)", "dh-golang"}
 	builddeps_bytype := append([]string{"golang-any"}, dependencies...)
 	sort.Strings(builddeps_bytype)
@@ -496,25 +496,27 @@ func writeTemplates(dir, gopkg, debsrc, debbin, debversion, pkgType string, depe
 		builddeps_deptype = "Arch"
 	}
 	fmt.Fprintf(f, "Build-Depends-%s:\n %s,\n", builddeps_deptype, strings.Join(builddeps_bytype, ",\n "))
-	fmt.Fprintf(f, "Standards-Version: 4.3.0\n")
-	fmt.Fprintf(f, "Homepage: %s\n", getHomepageForGopkg(gopkg))
+	fmt.Fprintf(f, "Standards-Version: 4.4.0\n")
 	fmt.Fprintf(f, "Vcs-Browser: https://salsa.debian.org/go-team/packages/%s\n", debsrc)
 	fmt.Fprintf(f, "Vcs-Git: https://salsa.debian.org/go-team/packages/%s.git\n", debsrc)
+	fmt.Fprintf(f, "Homepage: %s\n", getHomepageForGopkg(gopkg))
+	fmt.Fprintf(f, "Rules-Requires-Root: no\n")
 	fmt.Fprintf(f, "XS-Go-Import-Path: %s\n", gopkg)
-	fmt.Fprintf(f, "Testsuite: autopkgtest-pkg-go\n")
 	fmt.Fprintf(f, "\n")
 	fmt.Fprintf(f, "Package: %s\n", debbin)
 	deps := []string{"${misc:Depends}"}
 	if pkgType == "program" {
 		fmt.Fprintf(f, "Architecture: any\n")
-		fmt.Fprintf(f, "Built-Using: ${misc:Built-Using}\n")
 		deps = append(deps, "${shlibs:Depends}")
 	} else {
 		fmt.Fprintf(f, "Architecture: all\n")
 		deps = append(deps, dependencies...)
 	}
 	sort.Strings(deps)
 	fmt.Fprintf(f, "Depends:\n %s,\n", strings.Join(deps, ",\n "))
+	if pkgType == "program" {
+		fmt.Fprintf(f, "Built-Using: ${misc:Built-Using}\n")
+	}
 	description, err := getDescriptionForGopkg(gopkg)
 	if err != nil {
 		log.Printf("Could not determine description for %q: %v\n", gopkg, err)
@@ -699,8 +701,7 @@ func execMake(args []string, usage func()) {
 			fmt.Fprintf(os.Stderr, "Usage: %s [make] <go-package-importpath>\n", os.Args[0])
 			fmt.Fprintf(os.Stderr, "Example: %s make golang.org/x/oauth2\n", os.Args[0])
 			fmt.Fprintf(os.Stderr, "\n")
-			fmt.Fprintf(os.Stderr, "%s will create new files and directories in the current working directory.\n", os.Args[0])
-			fmt.Fprintf(os.Stderr, "%s will connect to the internet to download the specified Go package.\n", os.Args[0])
+			fmt.Fprintf(os.Stderr, "\"%s make\" downloads the specified Go package from the Internet,\nand creates new files and directories in the current working directory.\n", os.Args[0])
 			fmt.Fprintf(os.Stderr, "\n")
 			fmt.Fprintf(os.Stderr, "Flags:\n")
 			fs.PrintDefaults()
@@ -711,13 +712,13 @@ func execMake(args []string, usage func()) {
 	fs.StringVar(&gitRevision,
 		"git_revision",
 		"",
-		"git revision (see gitrevisions(7)) of the specified Go package to check out, defaulting to the default behavior of git clone. Useful in case you do not want to package e.g. current HEAD.")
+		"git revision (see gitrevisions(7)) of the specified Go package\nto check out, defaulting to the default behavior of git clone.\nUseful in case you do not want to package e.g. current HEAD.")
 
 	var allowUnknownHoster bool
 	fs.BoolVar(&allowUnknownHoster,
 		"allow_unknown_hoster",
 		false,
-		"The pkg-go naming conventions (see https://go-team.pages.debian.net/packaging.html) use a canonical identifier for the hostname, and the mapping is hardcoded into dh-make-golang. In case you want to package a Go package living on an unknown hoster, you may set this flag to true and double-check that the resulting package name is sane. Contact pkg-go if unsure.")
+		"The pkg-go naming conventions use a canonical identifier for\nthe hostname (see https://go-team.pages.debian.net/packaging.html),\nand the mapping is hardcoded into dh-make-golang.\nIn case you want to package a Go package living on an unknown hoster,\nyou may set this flag to true and double-check that the resulting\npackage name is sane. Contact pkg-go if unsure.")
 
 	var pkgType string
 	fs.StringVar(&pkgType,