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

Re: Converting dnstop to track upstream git



On 30/05/2025 19:10, Marc Haber wrote:
Now, how do I tell gbp from which commit on upstream/latest I want to base my next Debian version? How can I tell gbp to take HEAD of upstream/latest as the base of my current debian work AND allow gbp buildpackage to not complain about the out-of-debian/ changes?

If there are no tags, you can change d/watch to track HEAD in git mode, then it's
$ gbp import-orig --uscan

That will import d/watch HEAD as a new commit on upstream branch, tag upstream commit, then merge it into debian branch.
(I believe uscan does a shallow clone to get a tarball)

Example d/watch with version mangling looks like this:
https://salsa.debian.org/debian/openrgb/-/blob/debian/latest/debian/watch


PS, since you don't have a gbp.conf file, you may need to pass --upstream-branch and --debian-branch to all gbp commands.
Otherwise, the defaults are master and upstream.

--
Regards,
Ahmad


Reply to: