Skip to content

Commit 1171dc2

Browse files
committed
Revert "Put build artifacts in debian/build/ to avoid polluting upstream sources"
This reverts commit 0bdd05c. While the general idea makes sense and would make things better, this had some push back on the review and still got merged anyway. It also conflicts with an old proposal that still is pending to be updated and re-proposed to try to unify the build paths for all packages at the dpkg and debhelper layer, via a new dpkg-build-api level. And doing a migration twice seems wasteful. Ref: https://lists.debian.org/debian-dpkg/2020/03/msg00003.html
1 parent 70dfda7 commit 1171dc2

File tree

1 file changed

+1
-7
lines changed

1 file changed

+1
-7
lines changed

template.go

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,6 @@ func writeDebianGitIgnore(dir, debLib, debProg string, pkgType packageType) erro
8686
fmt.Fprintf(f, "*.log\n")
8787
fmt.Fprintf(f, "*.substvars\n")
8888
fmt.Fprintf(f, "/.debhelper/\n")
89-
fmt.Fprintf(f, "/build/\n")
9089
fmt.Fprintf(f, "/debhelper-build-stamp\n")
9190
fmt.Fprintf(f, "/files\n")
9291

@@ -300,12 +299,7 @@ func writeDebianRules(dir string, pkgType packageType) error {
300299
fmt.Fprintf(f, "#!/usr/bin/make -f\n")
301300
fmt.Fprintf(f, "\n")
302301
fmt.Fprintf(f, "%%:\n")
303-
fmt.Fprintf(f, "\tdh $@ --builddirectory=debian/build --buildsystem=golang\n")
304-
// Note: The above `--builddirectory=debian/build` will eventually be obsolete
305-
// in 2028+ then the dh-golang version 1.63+ that has
306-
// https://salsa.debian.org/go-team/packages/dh-golang/-/commit/bc16dff5381b668a71fa99c381baba202c34c789
307-
// is in use everywhere
308-
302+
fmt.Fprintf(f, "\tdh $@ --builddirectory=_build --buildsystem=golang\n")
309303
if pkgType == typeProgram {
310304
fmt.Fprintf(f, "\n")
311305
fmt.Fprintf(f, "override_dh_auto_install:\n")

0 commit comments

Comments
 (0)