default to dfsg branch (not upstream) for dfsg packages

[Rolf Leggewie]

Binary package hint: git-buildpackage

I'm not sure about best practice for dfsg packages, but personally, I have a separate dfsg upstream branch for those.

- debian branch
- upstream branch
- dfsg branch (derived from upstream)
- pristine-tar branch

I think it would be a good idea if gbp were to default to a branch called dfsg for dfsg packages.

[Guido Günther (agx)]

That's what the upstream-branch option is for. You can put this in your per-repo gbp.conf.

[Rolf Leggewie (r0lf)]

yes, of course. That's why I said it would be nice if gbp *defaulted* to that behaviour, so that explicitly specifying the upstream branch to use wasn't necessary.

[Rolf Leggewie (r0lf)]

this is not a setting that can be done per repo. This should depend on the revision string from changelog, it's quite possible that both dfsg and "normal" packages need to be built from the same repo.

[Rolf Leggewie (r0lf)]

I guess my request is the following: if the version indicates we're dealing with a dfsg repacked tarball, switch to the dfsg branch as (overridable) default. branch from upstream as necessary.