Skip to content

Commit 88748fe

Browse files
committed
template: Sort dependency list like wrap-and-sort
i.e., place variables like ${misc:Depends} and ${shlibs:Depends} at the end of the list. Fixes #121
1 parent b5c52b2 commit 88748fe

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

template.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -104,21 +104,21 @@ func addDescription(f *os.File, gopkg, comment string) {
104104
func addLibraryPackage(f *os.File, gopkg, debLib string, dependencies []string) {
105105
fmt.Fprintf(f, "\n")
106106
fmt.Fprintf(f, "Package: %s\n", debLib)
107-
deps := []string{"${misc:Depends}"}
108107
fmt.Fprintf(f, "Architecture: all\n")
109-
deps = append(deps, dependencies...)
108+
deps := dependencies
110109
sort.Strings(deps)
110+
deps = append(deps, "${misc:Depends}")
111111
fprintfControlField(f, "Depends", deps)
112112
addDescription(f, gopkg, "(library)")
113113
}
114114

115115
func addProgramPackage(f *os.File, gopkg, debProg string, dependencies []string) {
116116
fmt.Fprintf(f, "\n")
117117
fmt.Fprintf(f, "Package: %s\n", debProg)
118-
deps := []string{"${misc:Depends}"}
119118
fmt.Fprintf(f, "Architecture: any\n")
120-
deps = append(deps, "${shlibs:Depends}")
119+
deps := dependencies
121120
sort.Strings(deps)
121+
deps = append(deps, "${misc:Depends}", "${shlibs:Depends}")
122122
fprintfControlField(f, "Depends", deps)
123123
fmt.Fprintf(f, "Built-Using: ${misc:Built-Using}\n")
124124
addDescription(f, gopkg, "(program)")

0 commit comments

Comments
 (0)