Hi, On Sun, Dec 01, 2024 at 01:49:12PM -0800, Otto Kekäläinen wrote: > The changelog is easy to update to only include Debian changes with: > > gbp dch -- debian
That's not needed as gbp-dch looks at the packaging branch so commits from upstream vcs aren't included. Cheers, -- Guido > > Maybe gbp dch could have this automatically if debian/source/format > `3.0 (quilt)`? > > For context, I have this workflow for all my packages: > > git fetch --verbose upstreamvcs > # Note latest tag, e.g. r3.2, and verify it > git verify-tag r3.2 > # Import latest debian/patches so that it is easy to rebase later > gbp pq drop && gbp pq import && gbp pq switch > # Download upstream release tarball, and merge using both git tag > and tarball > gbp import-orig --uscan > gbp dch --distribution=UNRELEASED \ > --commit --commit-msg="Update changelog and refresh patches > after %(version)s import" \ > -- debian > gbp pq rebase > gbp pq export --drop --commit > git commit --all --amend # or `git citool --amend` > # Note: remember to manually strip '1:' and '-1' from commit > message title as > # the '%(version)s' output is the Debian version and not upstream version!
