Hi Faré,
On 2014-10-11 04:20 CEST, Faré fare@tunes.org wrote:
On Fri, Oct 10, 2014 at 6:53 PM, Kambiz Darabi darabi@m-creations.com wrote: [...] Mind that the correct release script is in the minimakefile branch, that I believe Robert is evaluating for merge into master. Also mind that said release script is too dumb to handle patches, and only works if your git tag 3.1.4 is the same as the HEAD of the build branch (by default, release). You can use git tag -f 3.1.4 to make several attempts. But of course, now that the upstream and debian maintainers are distinct, you can't do that anymore, or only as a temporary local kluge. Two solutions:
- modify the release script to actually handle debian patches the hard way,
whereby we fork a debian branch off of the release branch, and create files in debian/patches/ as necessary. Yuck.
Yes, I was bitten by it and this solution is really messy.
- cheat better, so that the release script doesn't use the version 3.1.4
as the base tag, but whatever is at the HEAD of the release branch; then you commit your debian changes to release (or debian) and commit --amend until you're happy.
With the change in [1] I can build off a branch 3.1.4, which I would create temporarily for the debian release process.
[...] I recommend you don't bother with the scripts in master, and instead use the tools in the minimakefile branch, due to be merged RSN.
Yes, with those tools and the change in [1] it was a breeze. Thank you! I hope Robert will merge the branch eventually.
When you're done, you (if you are a committer) or the maintainer can merge your changes into master.
I would propose the following workflow:
- I create a branch '3.x.y' and commit/amend until I'm happy
- I push the branch to my github repo
- Robert and others review the changes
- I build the package off that branch and upload it
This way, Robert and others will have the opportunity to veto the upload.
Robert and others on the list, what do you think?
Cheers
Kambiz
[1] https://github.com/darabi/asdf/commit/3e57db9e1e3488ed0269ea1d301fa29f0b83ed...