diff options
| -rw-r--r-- | argv.go | 13 | ||||
| -rw-r--r-- | buildPackage.go | 2 | ||||
| -rw-r--r-- | control | 1 | ||||
| -rw-r--r-- | controlBox.go | 5 | ||||
| -rw-r--r-- | examples/protoc-gen-go/Makefile | 4 | ||||
| -rwxr-xr-x | examples/protoc-gen-go/build | 4 | ||||
| -rw-r--r-- | examples/protoc-gen-go/control | 3 | ||||
| -rw-r--r-- | readControlFile.go | 2 |
8 files changed, 25 insertions, 9 deletions
@@ -15,12 +15,13 @@ import ( var argv args type args struct { - Auto bool `arg:"--auto" help:"automatically attempt to make the .deb"` - Ldflags []string `arg:"--ldflags" help:"flags to pass to go build"` - Repo string `arg:"--repo" help:"go get path to the repo"` - PkgDir string `arg:"--pkg-dir" help:"set default directory (~/incoming/)"` - Release bool `arg:"--release" help:"build a release from the last git tag"` - KeepFiles bool `arg:"--keep-files" help:"keep the build files/"` + Auto bool `arg:"--auto" help:"automatically attempt to make the .deb"` + Ldflags []string `arg:"--ldflags" help:"flags to pass to go build"` + Repo string `arg:"--repo" help:"go get path to the repo"` + PkgDir string `arg:"--pkg-dir" help:"set default directory (~/incoming/)"` + Release bool `arg:"--release" help:"build a release from the last git tag"` + KeepFiles bool `arg:"--keep-files" help:"keep the build files/"` + Force bool `arg:"--force" default:"false" help:"force overwrite an existing .deb file"` } func init() { diff --git a/buildPackage.go b/buildPackage.go index 856e960..047f77c 100644 --- a/buildPackage.go +++ b/buildPackage.go @@ -228,6 +228,8 @@ func (c *controlBox) writeDebianControlFile() bool { fmt.Fprintln(cf, "Git-Tag-Date:", c.tagDate.String()) fmt.Fprintln(cf, "Maintainer:", c.Maintainer.String()) + fmt.Fprintln(cf, "Conflicts:", c.Conflicts.String()) + desc := c.Description.String() parts := strings.Split(desc, "\n") fmt.Fprintln(cf, "Description:", strings.Join(parts, "\n ")) @@ -7,6 +7,7 @@ Architecture: amd64 Depends: URL: https://go.wit.com/ Recommends: go-gui-toolkits +Conflicts: testingoldstuff Description: create distribution packages for golang repositories Hopefully, this can make compatible and correct source packages for things like debuild or the incoming queue since diff --git a/controlBox.go b/controlBox.go index 1a4416e..ba8d377 100644 --- a/controlBox.go +++ b/controlBox.go @@ -19,6 +19,8 @@ type controlBox struct { Depends *gadgets.OneLiner BuildDepends *gadgets.OneLiner Recommends *gadgets.OneLiner + Conflicts *gadgets.BasicEntry + Test gui.Widget Description *gadgets.OneLiner // repostatus things @@ -79,6 +81,9 @@ func newControl(parent *gui.Node) *controlBox { c.Recommends = gadgets.NewOneLiner(c.grid, "Recommends") c.grid.NextRow() + c.Conflicts = gadgets.NewBasicEntry(c.grid, "Conflicts") + c.grid.NextRow() + c.Description = gadgets.NewOneLiner(c.grid, "Description") c.grid.NextRow() diff --git a/examples/protoc-gen-go/Makefile b/examples/protoc-gen-go/Makefile index d28f0e1..f2853e0 100644 --- a/examples/protoc-gen-go/Makefile +++ b/examples/protoc-gen-go/Makefile @@ -5,6 +5,10 @@ all: build build: go-deb --repo . +# keep the files/ directory after the package is made +keep-files: + go-deb --keep-files --repo . + # use the ncurses gui (only kinda works still) ncurses: go-deb --gui gocui --repo . diff --git a/examples/protoc-gen-go/build b/examples/protoc-gen-go/build index f8e2b06..2b19bb6 100755 --- a/examples/protoc-gen-go/build +++ b/examples/protoc-gen-go/build @@ -4,7 +4,7 @@ # # go-clone google.golang.org/protobuf # cd ~/go/src/google.golang.org/protobuf/cmd/protoc-gen-go -# go install +# go build mkdir -p files/usr/bin -cp ~/go/bin/protoc-gen-go files/usr/bin +cp ~/go/src/google.golang.org/protobuf/cmd/protoc-gen-go/protoc-gen-go files/usr/bin/ diff --git a/examples/protoc-gen-go/control b/examples/protoc-gen-go/control index c1090d5..e0b826a 100644 --- a/examples/protoc-gen-go/control +++ b/examples/protoc-gen-go/control @@ -5,9 +5,10 @@ Maintainer: Jeff Carr <[email protected]> Packager: Jeff Carr <[email protected]> Architecture: amd64 Depends: protobuf-compiler +Conflicts: protoc-gen-go, protoc-gen-go-1-3, protoc-gen-go-1-5 URL: https://go.wit.com/ Recommends: -Version: 0.0.3 +Version: 1.35.1-devel Description: protoc-gen-go from google.golang.org/protobuf You need this one until the debian sid packages are updated I didn't change anything, it's a straight build from the sources. diff --git a/readControlFile.go b/readControlFile.go index 9d2bf0d..50a4fdd 100644 --- a/readControlFile.go +++ b/readControlFile.go @@ -69,6 +69,8 @@ func (c *controlBox) readControlFile() error { c.Depends.SetText(value) case "Recommends": c.Recommends.SetText(value) + case "Conflicts": + c.Conflicts.SetText(value) case "Version": c.Version.SetText(value) case "Package": |