[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: Our policy around gbp.conf



Hello,
 
> > D) [import-orig] filter-pristine-tar = True
> > I don't understand exactly what this does, found this description: "filter
> > out files from tarball passed to pristine tar".
> > What is this filtering? Can somebody give me an example?
>
> It just means that we store in pristine-tar the tarball after it has been
> filtered (and not before).

Ack, this seems like it should be gbp's default.

> > D) [pq] patch-numbers = False
> > I don't use pq yet, and I feel bad for that, but I don't know what this
> > option does
>
> By default the patches generated in debian/patches/ are named like the
> output of "git format-patch", i.e. 0001-Foo.patch, 0002-Bar.patch, etc.
>
> With this option the numbered prefix is dropped and avoids churns when you
> reorder the patch series.

Ack, this seems good to me.
 
> > E) [dch] multimaint-merge = True
> > I don't understand this option.
>
> When you generate the changelog, all entries for each maintainer are
> grouped in a single block instead of having multiple blocks respecting
> the timeline.

Got it, also good to me.

> > What are your thoughts?
>
> I would drop "cleaner", "export-dir" and keep the rest. export-dir is
> still a matter of personal preference and might require other changes
> (like DEBRELEASE_DEBS_DIR=../build-area) to fully benefit from it.

Dropped (see updated proposal at the end of email)

> > On a side note, I think the option "debian-branch" could support having a
> > variable for the current branch as its value, this way gbp.conf could be
> > easily reusable in a debian/experimental or debian/whatever branch.
>
> What do you mean?

I mean that debian-branch should support a value like "$this-branch" when set
through debian/gbp.conf, and then when gbp parses the config it sets that to
the branch which the file persists. This would allow one to use the same
file between the different debian/* branches and the current checked out
branch would be the debian one.

> I agree it's painful to have to update this file when you work in other
> branches, hence why I use "ignore-branch" and tend to not hardcode the
> branch in the configuration file..

So the disadvantage of debian-branch is that when we branch from
debian/master, we need to either change gbp.conf or explicitly pass
--debian-branch=debian/NAME to the commands. Considering you said yes
to C), I assume your idea is that somebody who doesn't wanna have this
problem will set ignore-branch in their ~/.gbp.conf, correct me if I'm wrong.

So the updated proposal would be (drop export-dir and cleaner):
----------------------------------------
[DEFAULT]
debian-branch = debian/master
pristine-tar = True

[buildpackage]
sign-tags = True

[import-orig]
filter-pristine-tar = True

[pq]
patch-numbers = False

[dch]
multimaint-merge = True
----------------------------------------

Regards,

--
Samuel Henrique <samueloph>

Reply to: