Hi Sandro, On Tue, Jun 21, 2022 at 12:31:40AM -0400, Sandro Tosi wrote: > Package: git-buildpackage > Version: 0.9.22 > Severity: minor > X-Debbugs-Cc: mo...@debian.org > > Hello, > after reading [1] (thanks for that btw!) i was still unsure how to proceed > > [1] > https://honk.sigxcpu.org/projects/git-buildpackage/manual-html/gbp.special.nmus.html > > thru some trial and error i found the below procedure to work flawlessly, > so i think i'd contribute back so that you can expand the doc to include that: > > 0. download all the "missing" debian source packages in a temporary location > - and example on how to do that is `depsnap -d /temp/location/ <src > package?>` > 1. `git checkout <packaging branch>` > usually master|main|debian/master > 2. gbp import-dsc --debian-branch=nmu --create-missing-branches > /temp/location/pkg_ver.dsc > repeat as many time as needed, follow chronological order. > this will also take care of creating tags, importing new upstream > releases, update pristine-tar, etc > 3. `git merge nmu` > do the usual git merge dance > 4. `git branch --delete nmu`
Thanks for taking the time to write that down. I'm happy to apply patches to the documentation along these lines. Cheers, -- Guido > > thanks! > > -- System Information: > Debian Release: 11.0 > APT prefers unstable > APT policy: (500, 'unstable'), (1, 'experimental') > Architecture: amd64 (x86_64) > Foreign Architectures: i386 > > Kernel: Linux 5.17.0-3-amd64 (SMP w/8 CPU threads; PREEMPT) > Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), LANGUAGE not > set > Shell: /bin/sh linked to /bin/dash > Init: systemd (via /run/systemd/system) > LSM: AppArmor: enabled > > Versions of packages git-buildpackage depends on: > ii devscripts 2.21.3 > ii git 1:2.33.1-1 > ii man-db 2.9.4-2 > ii python3 3.9.8-1 > ii python3-dateutil 2.8.1-6 > ii python3-pkg-resources 59.6.0-1.2 > ii sensible-utils 0.0.14 > > Versions of packages git-buildpackage recommends: > ii cowbuilder 0.89 > ii pbuilder 0.231 > ii pristine-tar 1.49 > ii python3-requests 2.25.1+dfsg-2 > ii sbuild 0.81.2 > > Versions of packages git-buildpackage suggests: > pn python3-notify2 <none> > ii sudo 1.9.5p2-3 > ii unzip 6.0-26 > > -- no debconf information >
