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

Re: Converting dnstop to track upstream git



On Fri, May 30, 2025 at 07:37:09PM +0100, Ahmad Khalifa wrote:
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

Thank you. That was helpful. Having to go through a d/watch file and uscan for some reason feels like a detour, but it actually worked.

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.

I have that set in ~/.gbp.conf, but you're of course right, that belongs also in debian/gbp.conf. Done.

Greetings
Marc

--
-----------------------------------------------------------------------------
Marc Haber         | "I don't trust Computers. They | Mailadresse im Header
Leimen, Germany    |  lose things."    Winona Ryder | Fon: *49 6224 1600402
Nordisch by Nature |  How to make an American Quilt | Fax: *49 6224 1600421


Reply to: