Skip to content

Commit e2f461e

Browse files
committed
New upstream version 0.0~git20190305.55fc2d0
1 parent 946f4e6 commit e2f461e

File tree

3 files changed

+25
-23
lines changed

3 files changed

+25
-23
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
dh-make-golang
2+
_build/

make.go

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -475,13 +475,6 @@ func writeTemplates(dir, gopkg, debsrc, debbin, debversion, pkgType string, depe
475475
getDebianEmail(),
476476
time.Now().Format("Mon, 02 Jan 2006 15:04:05 -0700"))
477477

478-
f, err = os.Create(filepath.Join(dir, "debian", "compat"))
479-
if err != nil {
480-
return err
481-
}
482-
defer f.Close()
483-
fmt.Fprintf(f, "11\n")
484-
485478
f, err = os.Create(filepath.Join(dir, "debian", "control"))
486479
if err != nil {
487480
return err
@@ -492,11 +485,18 @@ func writeTemplates(dir, gopkg, debsrc, debbin, debversion, pkgType string, depe
492485
fmt.Fprintf(f, "Section: devel\n")
493486
fmt.Fprintf(f, "Priority: optional\n")
494487
fmt.Fprintf(f, "Maintainer: Debian Go Packaging Team <[email protected]>\n")
495-
fmt.Fprintf(f, "Uploaders: %s <%s>\n", getDebianName(), getDebianEmail())
496-
sort.Strings(dependencies)
497-
builddeps := append([]string{"debhelper (>= 11)", "dh-golang", "golang-any"}, dependencies...)
498-
fmt.Fprintf(f, "Build-Depends: %s\n", strings.Join(builddeps, ",\n "))
499-
fmt.Fprintf(f, "Standards-Version: 4.2.1\n")
488+
fmt.Fprintf(f, "Uploaders:\n %s <%s>,\n", getDebianName(), getDebianEmail())
489+
fmt.Fprintf(f, "Rules-Requires-Root: no\n")
490+
builddeps := []string{"debhelper-compat (= 12)", "dh-golang"}
491+
builddeps_bytype := append([]string{"golang-any"}, dependencies...)
492+
sort.Strings(builddeps_bytype)
493+
fmt.Fprintf(f, "Build-Depends:\n %s,\n", strings.Join(builddeps, ",\n "))
494+
builddeps_deptype := "Indep"
495+
if pkgType == "program" {
496+
builddeps_deptype = "Arch"
497+
}
498+
fmt.Fprintf(f, "Build-Depends-%s:\n %s,\n", builddeps_deptype, strings.Join(builddeps_bytype, ",\n "))
499+
fmt.Fprintf(f, "Standards-Version: 4.3.0\n")
500500
fmt.Fprintf(f, "Homepage: %s\n", getHomepageForGopkg(gopkg))
501501
fmt.Fprintf(f, "Vcs-Browser: https://salsa.debian.org/go-team/packages/%s\n", debsrc)
502502
fmt.Fprintf(f, "Vcs-Git: https://salsa.debian.org/go-team/packages/%s.git\n", debsrc)
@@ -513,7 +513,8 @@ func writeTemplates(dir, gopkg, debsrc, debbin, debversion, pkgType string, depe
513513
fmt.Fprintf(f, "Architecture: all\n")
514514
deps = append(deps, dependencies...)
515515
}
516-
fmt.Fprintf(f, "Depends: %s\n", strings.Join(deps, ",\n "))
516+
sort.Strings(deps)
517+
fmt.Fprintf(f, "Depends:\n %s,\n", strings.Join(deps, ",\n "))
517518
description, err := getDescriptionForGopkg(gopkg)
518519
if err != nil {
519520
log.Printf("Could not determine description for %q: %v\n", gopkg, err)
@@ -544,20 +545,20 @@ func writeTemplates(dir, gopkg, debsrc, debbin, debversion, pkgType string, depe
544545
copyright = "TODO"
545546
}
546547
fmt.Fprintf(f, "Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/\n")
547-
fmt.Fprintf(f, "Upstream-Name: %s\n", filepath.Base(gopkg))
548548
fmt.Fprintf(f, "Source: %s\n", getHomepageForGopkg(gopkg))
549+
fmt.Fprintf(f, "Upstream-Name: %s\n", filepath.Base(gopkg))
549550
fmt.Fprintf(f, "Files-Excluded:\n")
550551
for _, dir := range vendorDirs {
551-
fmt.Fprintf(f, " %s\n", dir)
552+
fmt.Fprintf(f, " %s\n", dir)
552553
}
553-
fmt.Fprintf(f, " Godeps/_workspace\n")
554+
fmt.Fprintf(f, " Godeps/_workspace\n")
554555
fmt.Fprintf(f, "\n")
555-
fmt.Fprintf(f, "Files: *\n")
556-
fmt.Fprintf(f, "Copyright: %s\n", copyright)
556+
fmt.Fprintf(f, "Files:\n *\n")
557+
fmt.Fprintf(f, "Copyright:\n %s\n", copyright)
557558
fmt.Fprintf(f, "License: %s\n", license)
558559
fmt.Fprintf(f, "\n")
559-
fmt.Fprintf(f, "Files: debian/*\n")
560-
fmt.Fprintf(f, "Copyright: %s %s <%s>\n", time.Now().Format("2006"), getDebianName(), getDebianEmail())
560+
fmt.Fprintf(f, "Files:\n debian/*\n")
561+
fmt.Fprintf(f, "Copyright:\n %s %s <%s>\n", time.Now().Format("2006"), getDebianName(), getDebianEmail())
561562
fmt.Fprintf(f, "License: %s\n", license)
562563
fmt.Fprintf(f, "Comment: Debian packaging is licensed under the same terms as upstream\n")
563564
fmt.Fprintf(f, "\n")
@@ -577,7 +578,7 @@ func writeTemplates(dir, gopkg, debsrc, debbin, debversion, pkgType string, depe
577578
fmt.Fprintf(f, "\n")
578579
}
579580
fmt.Fprintf(f, "%%:\n")
580-
fmt.Fprintf(f, "\tdh $@ --buildsystem=golang --with=golang\n")
581+
fmt.Fprintf(f, "\tdh $@ --builddirectory=_build --buildsystem=golang --with=golang\n")
581582

582583
f, err = os.Create(filepath.Join(dir, "debian", "source", "format"))
583584
if err != nil {

metadata.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,11 +135,11 @@ func getLicenseForGopkg(gopkg string) (string, string, error) {
135135
if deblicense, ok := githubLicenseToDebianLicense[rl.GetLicense().GetKey()]; ok {
136136
fulltext := debianLicenseText[deblicense]
137137
if fulltext == "" {
138-
fulltext = "TODO"
138+
fulltext = " TODO"
139139
}
140140
return deblicense, fulltext, nil
141141
} else {
142-
return "TODO", "TODO", nil
142+
return "TODO", " TODO", nil
143143
}
144144
}
145145

0 commit comments

Comments
 (0)