add Conflicts:
This commit is contained in:
parent
891a4cada9
commit
1c2246e709
13
argv.go
13
argv.go
|
@ -15,12 +15,13 @@ import (
|
||||||
var argv args
|
var argv args
|
||||||
|
|
||||||
type args struct {
|
type args struct {
|
||||||
Auto bool `arg:"--auto" help:"automatically attempt to make the .deb"`
|
Auto bool `arg:"--auto" help:"automatically attempt to make the .deb"`
|
||||||
Ldflags []string `arg:"--ldflags" help:"flags to pass to go build"`
|
Ldflags []string `arg:"--ldflags" help:"flags to pass to go build"`
|
||||||
Repo string `arg:"--repo" help:"go get path to the repo"`
|
Repo string `arg:"--repo" help:"go get path to the repo"`
|
||||||
PkgDir string `arg:"--pkg-dir" help:"set default directory (~/incoming/)"`
|
PkgDir string `arg:"--pkg-dir" help:"set default directory (~/incoming/)"`
|
||||||
Release bool `arg:"--release" help:"build a release from the last git tag"`
|
Release bool `arg:"--release" help:"build a release from the last git tag"`
|
||||||
KeepFiles bool `arg:"--keep-files" help:"keep the build files/"`
|
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() {
|
func init() {
|
||||||
|
|
|
@ -228,6 +228,8 @@ func (c *controlBox) writeDebianControlFile() bool {
|
||||||
fmt.Fprintln(cf, "Git-Tag-Date:", c.tagDate.String())
|
fmt.Fprintln(cf, "Git-Tag-Date:", c.tagDate.String())
|
||||||
|
|
||||||
fmt.Fprintln(cf, "Maintainer:", c.Maintainer.String())
|
fmt.Fprintln(cf, "Maintainer:", c.Maintainer.String())
|
||||||
|
fmt.Fprintln(cf, "Conflicts:", c.Conflicts.String())
|
||||||
|
|
||||||
desc := c.Description.String()
|
desc := c.Description.String()
|
||||||
parts := strings.Split(desc, "\n")
|
parts := strings.Split(desc, "\n")
|
||||||
fmt.Fprintln(cf, "Description:", strings.Join(parts, "\n "))
|
fmt.Fprintln(cf, "Description:", strings.Join(parts, "\n "))
|
||||||
|
|
1
control
1
control
|
@ -7,6 +7,7 @@ Architecture: amd64
|
||||||
Depends:
|
Depends:
|
||||||
URL: https://go.wit.com/
|
URL: https://go.wit.com/
|
||||||
Recommends: go-gui-toolkits
|
Recommends: go-gui-toolkits
|
||||||
|
Conflicts: testingoldstuff
|
||||||
Description: create distribution packages for golang repositories
|
Description: create distribution packages for golang repositories
|
||||||
Hopefully, this can make compatible and correct source
|
Hopefully, this can make compatible and correct source
|
||||||
packages for things like debuild or the incoming queue since
|
packages for things like debuild or the incoming queue since
|
||||||
|
|
|
@ -19,6 +19,8 @@ type controlBox struct {
|
||||||
Depends *gadgets.OneLiner
|
Depends *gadgets.OneLiner
|
||||||
BuildDepends *gadgets.OneLiner
|
BuildDepends *gadgets.OneLiner
|
||||||
Recommends *gadgets.OneLiner
|
Recommends *gadgets.OneLiner
|
||||||
|
Conflicts *gadgets.BasicEntry
|
||||||
|
Test gui.Widget
|
||||||
Description *gadgets.OneLiner
|
Description *gadgets.OneLiner
|
||||||
|
|
||||||
// repostatus things
|
// repostatus things
|
||||||
|
@ -79,6 +81,9 @@ func newControl(parent *gui.Node) *controlBox {
|
||||||
c.Recommends = gadgets.NewOneLiner(c.grid, "Recommends")
|
c.Recommends = gadgets.NewOneLiner(c.grid, "Recommends")
|
||||||
c.grid.NextRow()
|
c.grid.NextRow()
|
||||||
|
|
||||||
|
c.Conflicts = gadgets.NewBasicEntry(c.grid, "Conflicts")
|
||||||
|
c.grid.NextRow()
|
||||||
|
|
||||||
c.Description = gadgets.NewOneLiner(c.grid, "Description")
|
c.Description = gadgets.NewOneLiner(c.grid, "Description")
|
||||||
c.grid.NextRow()
|
c.grid.NextRow()
|
||||||
|
|
||||||
|
|
|
@ -5,6 +5,10 @@ all: build
|
||||||
build:
|
build:
|
||||||
go-deb --repo .
|
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)
|
# use the ncurses gui (only kinda works still)
|
||||||
ncurses:
|
ncurses:
|
||||||
go-deb --gui gocui --repo .
|
go-deb --gui gocui --repo .
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
#
|
#
|
||||||
# go-clone google.golang.org/protobuf
|
# go-clone google.golang.org/protobuf
|
||||||
# cd ~/go/src/google.golang.org/protobuf/cmd/protoc-gen-go
|
# cd ~/go/src/google.golang.org/protobuf/cmd/protoc-gen-go
|
||||||
# go install
|
# go build
|
||||||
|
|
||||||
mkdir -p files/usr/bin
|
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/
|
||||||
|
|
|
@ -5,9 +5,10 @@ Maintainer: Jeff Carr <jcarr@wit.com>
|
||||||
Packager: Jeff Carr <jcarr@wit.com>
|
Packager: Jeff Carr <jcarr@wit.com>
|
||||||
Architecture: amd64
|
Architecture: amd64
|
||||||
Depends: protobuf-compiler
|
Depends: protobuf-compiler
|
||||||
|
Conflicts: protoc-gen-go, protoc-gen-go-1-3, protoc-gen-go-1-5
|
||||||
URL: https://go.wit.com/
|
URL: https://go.wit.com/
|
||||||
Recommends:
|
Recommends:
|
||||||
Version: 0.0.3
|
Version: 1.35.1-devel
|
||||||
Description: protoc-gen-go from google.golang.org/protobuf
|
Description: protoc-gen-go from google.golang.org/protobuf
|
||||||
You need this one until the debian sid packages are updated
|
You need this one until the debian sid packages are updated
|
||||||
I didn't change anything, it's a straight build from the sources.
|
I didn't change anything, it's a straight build from the sources.
|
||||||
|
|
|
@ -69,6 +69,8 @@ func (c *controlBox) readControlFile() error {
|
||||||
c.Depends.SetText(value)
|
c.Depends.SetText(value)
|
||||||
case "Recommends":
|
case "Recommends":
|
||||||
c.Recommends.SetText(value)
|
c.Recommends.SetText(value)
|
||||||
|
case "Conflicts":
|
||||||
|
c.Conflicts.SetText(value)
|
||||||
case "Version":
|
case "Version":
|
||||||
c.Version.SetText(value)
|
c.Version.SetText(value)
|
||||||
case "Package":
|
case "Package":
|
||||||
|
|
Loading…
Reference in New Issue