Re: Bug#1011666: need help with groff 1.23.0 (1.23.0~rc3-1 package prepared)
On Sat, Feb 25, 2023 at 11:13:29PM -0600, G. Branden Robinson wrote:
> I've sent you a couple of mails over the past few months, but I don't
> recall seeing a reply.
Sorry about that! Feel free to grab me on IRC if I'm not replying to
email.
> I am not a proficient gbp user, but I think I have done what is
> necessary.
groff doesn't use gbp - it uses git-dpm. If you try to use gbp for it
then you will probably get quite confused and so will I, so please
don't.
First, move your current branch somewhere for reference, then make a new
one. Then, my routine for pulling in new upstreams looks roughly like
this:
git-dpm import-new-upstream -p $UPSTREAMTAG^{} --rebase-patched ../foo.orig.tar.gz
# this imports the unpacked upstream tarball onto an upstream branch
# based on $UPSTREAMTAG, then drops you into a rebase session
... continue with rebase as needed, then once you're finished ...
git-dpm update-patches --amend
# the --amend is just because the import-new-upstream step will
# already have recorded the new upstream on the branch you started
# from, but the history looks clearer if you bundle the rebase with
# that in a single merge commit, which this does
Then you can cherry-pick your packaging changes on top of this, as well
as telling pristine-tar about the new upstream tarball based on the
appropriate imported branch.
If you push the results to a temporary branch on salsa then I can look
over them, which is probably a good idea since you're unfamiliar with
git-dpm.
> How do we move forward with this? I am anxious about the closing of the
> soft freeze window.
There is no way that this giant new upstream release will be suitable at
this stage in the freeze; it's too late. This should be targeted at
experimental.
--
Colin Watson (he/him) [cjwatson@debian.org]
Reply to: