On Monday, October 27, 2025 8:08:25 PM Mountain Standard Time Seyed Mohamad Amin Modaresi wrote: > Hi, > > I waited for the new tag and the upstream compeletly removed the > aux/rpm/bazaar.spec file in the new tag. So I think copyright problems were > fixed. > > I uploaded the new tag.
The versions in the branches on Salsa are a mess. master has 0.5.7 upstream has 0.5.5 pristine-tar has 0.5.3 You also have an upstream/0.5.7 tag, but it doesn’t point to a commit in the upstream branch. I would recommend you do the following to fix the situation: 1. Create a debian/gbp.conf file with the following contents. This makes it so that --pristine-tar is appended to each command, which it isn’t currently. https://salsa.debian.org/cryptocoin-team/electrum/-/blob/master/debian/ gbp.conf?ref_type=heads 2. Delete your current upstream/0.5.7 tag. You might be able to get away with not doing this, depending on the state of your local repositories. $ git tag -d upstream/0.5.7 If you do this, you will also need to delete the current upstream/0.5.7 tag on Salsa or your push will fail. 3. Correctly import the new upstream release. $ gbp import-orig --uscan --upstream-version 0.5.7 In the future, you can just use the following command, but as your changelog already lists 0.5.7 we have to be more explicit. $ gbp import-orig --uscan --upstream-version 0.5.7 4. Push all three branches and all the tags to Salsa. $ gpb push This will run five different git push commands. Note that running `gbp tag` will create the debian/0.X.X tag if the changelog is not targeting UNRELEASED. Once the final release is ready, you can change UNRELEASED to unstable, run `gbp tag`, and then run `gbp push`. -- Soren Stoutner [email protected]
signature.asc
Description: This is a digitally signed message part.
