[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: Uploading Praat 3.5.35-1

* Andreas Tille <andreas@an3as.eu> [2012-12-12 08:50]:

I take the freedom to answer on Debian Med list because your practice to handle experimental branch sounds interesting. [snip]

Ok, keep me in Cc, since I am not subscribed to the ML.

On Wed, Dec 12, 2012 at 07:39:48AM +0100, Rafael Laboissiere wrote:

I just committed the changes to the praat package Git repository regarding the new upstream version 3.5.35. I used the experimental branch instead of master for that. Version 3.5.35-1 of the package would then be uploaded to the experimental distribution. We adopted this practice in the Debian Octave Group, because this keeps the master branch clean for changes in unstable, which is the preferred route for updates intended to be migrated into testing and that fix RC bugs.

Uploading to experimental in freeze time is handled in Debian Med team the same way but we did not used a different branch. I'd consider this interesting however, you might blame my Git beginner status responsible for not understanding how you upgrade from experimental to unstable once stable is released. Will you merge the experimental branch with master then or will you simply move on in master branch (targeting at unstable) by ignoring the changelog entries done meanwhile in experimental. I would not like the latter because this would be a loss of information for non-Git users just looking at the package changelog.

I think that merging experimental and master is the appropriate way of handling it, since the entries of both branches will appear in debian/changelog.

I do not know how familiar you are with the git-buildpackage framework, but here are the commands that should work for building the new version in the experimental branch:

gbp-pull git pull --all git checkout experimental git-dch --ignore-branch git-buildpackage --git-ignore-new

I rather used

git-buildpackage --git-debian-branch=experimental

and I guess this is what you intended to write, right?

Yes, I think this is similar.

You should then change the distribution in debian/changelog from "UNRELEASED" to "experimental" before building the final package.

Done and uploaded.


As far as I understood you have some contact to upstream. I wonder whether they might like to include the two quilt patches.

Yes, Paul Boersma and I are researchers working in the same domain (speech production/perception) and we even meet at scientific meetings from time to time. I will ask him about the quilt patches, even though they are quite Debian-specific.

Note also that I included a new icon (debian/praat.svg, created by me) in version 3.5.35-1, which has a much better quality than the praat.xpm icon that is shipped by upstream. I already offered it to Paul and it will eventually be integrated upstream.



Reply to: