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

Re: Incorporating patches best practice



Le lundi 11 juillet 2011 06:52:58, Ben Finney a écrit :
> Gary Briggs <chunky@icculus.org> writes:
[SNIP]
> 
> > 1) Obviously not appropriate in the general case, but I could do a
> > major new release, since I've added a couple of big features since the
> > last deiban package.
> 
> A new release of the same upstream version? Sure, but any changes would
> be distinct from the upstream version still.
As you are both upstream and maintainer of this package you can perfectly do 
this, unless you think the changes are not worth a new upstream release.
> 
> > 2) Re-package the current package, but include the one patch, and ramp
> > the debian version suffix [to 0.16-2]
> 
> That sounds like the right option. The patch can go in ‘debian/patches/’
> until upstream releases a new version which incorporates it.
Agreed. Even when you are upstream, if the changes are too minor and you don't 
want to do a new upstream release, then it's the way to go.
> 
> > 3) Re-package at the current version and ramp the debian version
> > suffix, but include the patch directly in the source; basically,
> > change the main source tarball to be the current svn version.
> 
> That would be a lie: you would be claiming the source is what upstream
> calls version 0.16, but it's not.
No need to call it version 0.16. He can call it 0.17~svn1 or 0.16+svn1 and do 
a snapshot of the SVN, as he mentionned.
> 
> > Of course, that would include the major changes I've made since I
> > officially released 0.16...
> 
> If you've been making changes that make your release different from the
> upstream version, they should be applied as patches to that version.
> 
> Please don't modify the source of an already-released version directly
> to apply your changes.
> 
> > I suspect that the best answer is #2, but that feels a little hokey
> > when I'm the upstream as well as the package maintainer.
> 
> You need to wear different hats :-)
> 
> For more on how to be an upstream which makes Debian's work easier, see
> <URL:http://wiki.debian.org/UpstreamGuide> and especially
> <URL:http://wiki.debian.org/UpstreamGuide#Releases_and_Versions>.

Attachment: signature.asc
Description: This is a digitally signed message part.


Reply to: