Revert "Use DEP-14 branch names debian/latest and upstream/latest"

This reverts commit 79a2cc6.

This was pushed and merged in a rush without Go team agreement or
consensus, based on false premises where even the DEP it is based on
does not have any mention of there being defaults preferences for
these changes, where there's been recorded objections in general in
the Debian project at large in the past, and where even existing
practice (as analyzed by the same author) does not support these
defaults being the majority in use.

Ref: https://lists.debian.org/debian-devel/2024/08/msg00299.html

Author: guillemj

make.go

@@ -416,7 +416,7 @@ func runGitCommandIn(dir string, arg ...string) error {
 }
 
 func createGitRepository(debsrc, gopkg, orig string, u *upstream,
-	includeUpstreamHistory bool, allowUnknownHoster bool, debianBranch string, dep14 bool, pristineTar bool) (string, error) {
+	includeUpstreamHistory bool, allowUnknownHoster bool, debianBranch string, pristineTar bool) (string, error) {
 	wd, err := os.Getwd()
 	if err != nil {
 		return "", fmt.Errorf("get cwd: %w", err)
@@ -462,7 +462,7 @@ func createGitRepository(debsrc, gopkg, orig string, u *upstream,
 
 	// Preconfigure branches
 
-	branches := []string{debianBranch, "upstream/latest"}
+	branches := []string{debianBranch, "upstream"}
 	if pristineTar {
 		branches = append(branches, "pristine-tar")
 	}
@@ -496,9 +496,6 @@ func createGitRepository(debsrc, gopkg, orig string, u *upstream,
 	// Import upstream orig tarball
 
 	arg := []string{"import-orig", "--no-interactive", "--debian-branch=" + debianBranch}
-	if dep14 {
-		arg = append(arg, "--upstream-branch=upstream/latest")
-	}
 	if pristineTar {
 		arg = append(arg, "--pristine-tar")
 	}
@@ -780,7 +777,7 @@ func execMake(args []string, usage func()) {
 	fs.BoolVar(&dep14,
 		"dep14",
 		true,
-		"Follow DEP-14 branch naming and use debian/latest (instead of master)\n"+
+		"Follow DEP-14 branch naming and use debian/sid (instead of master)\n"+
 			"as the default debian-branch.")
 
 	var pristineTar bool
@@ -890,7 +887,7 @@ func execMake(args []string, usage func()) {
 	// Set the debian branch.
 	debBranch := "master"
 	if dep14 {
-		debBranch = "debian/latest"
+		debBranch = "debian/sid"
 	}
 
 	switch strings.TrimSpace(wrapAndSort) {
@@ -981,7 +978,7 @@ func execMake(args []string, usage func()) {
 
 	debversion := u.version + "-1"
 
-	dir, err := createGitRepository(debsrc, gopkg, orig, u, includeUpstreamHistory, allowUnknownHoster, debBranch, dep14, pristineTar)
+	dir, err := createGitRepository(debsrc, gopkg, orig, u, includeUpstreamHistory, allowUnknownHoster, debBranch, pristineTar)
 	if err != nil {
 		log.Fatalf("Could not create git repository: %v\n", err)
 	}

template.go

@@ -337,8 +337,7 @@ func writeDebianGbpConf(dir string, dep14, pristineTar bool) error {
 
 	fmt.Fprintf(f, "[DEFAULT]\n")
 	if dep14 {
-		fmt.Fprintf(f, "debian-branch = debian/latest\n")
-		fmt.Fprintf(f, "upstream-branch = upstream/latest\n")
+		fmt.Fprintf(f, "debian-branch = debian/sid\n")
 		fmt.Fprintf(f, "dist = DEP14\n")
 	}
 	if pristineTar {