On 2/28/24 1:05 PM, Amanda McCann wrote:
On Mo, 29 Jan 2024 11:43 +01:00, Bas Couwenberg (@sebastic)
<git...@salsa.debian.org> wrote:
Bas Couwenberg <https://salsa.debian.org/sebastic> commented
<https://salsa.debian.org/debian-gis-team/tirex/-/merge_requests/2#note_459275>:
If not a MR, what should i do?
Follow the procedure documented in the team policy:
https://debian-gis-team.pages.debian.net/policy/packaging.html#git-new-upstream
You need to push all three branches (master, pristine-tar, upstream) to
the repo in the team namespace, not your fork.
I didn't push the new branches to the team repo, because I didn't want to break
things. 😅
git makes reverting breakage easy, unless you try really hard to be
destructive.
There are no changes on your pristine-tar branch, if you used uscan to
download the new upstream tarball and gbp import-orig to import it,
you'd have these changes as debian/gbp.conf is configured to do the
right thing.
This is what I did for the new upstream release:
# Download new upstream tarball
uscan --verbose
# Import tarball in upstream branch,
# add checkum to pristine-tar branch,
# merge upstream tag into master branch
gbp import-orig ../tirex_0.7.1.orig.tar.gz
# Update debian/changelgo
dch -v 0.7.1-1
<Add "New upstream release." entry in the appropriate place>
debcommit -a
# Refresh patches
quilt push && quilt refresh
<Patch 0001-....patch can be reverse-applied>
quilt delete 0001-Make-sure-usr-libexec-directory-extists.patch && git
rm debian/patches/0001-Make-sure-usr-libexec-directory-extists.patch
quilt push && quilt refresh
quilt pop -a
rm -rf .pc
dch -a
<Add "Refresh patches." entry in the appropriate place>
debcommit -a
# Perform test build
gbp buildpackage --git-pbuilder
<Notice lintian error: alien-tag>
vi debian/tirex.lintian-overrides
<Remove the now alien tag>
dch -a
<Add "Update lintian overrides." entry in the appropriate place>
debcommit -a
# Push changes to Salsa
git push --all && git push --tags
How does this procedure differ from what you did to package the new
upstream release?
Kind Regards,
Bas
--
GPG Key ID: 4096R/6750F10AE88D4AF1
Fingerprint: 8182 DE41 7056 408D 6146 50D1 6750 F10A E88D 4AF1
_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@alioth-lists.debian.net
https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-grass-devel
