[Pkg-clamav-devel] VCS discussion

Scott Kitterman debian at kitterman.com
Tue Aug 26 03:09:31 UTC 2008


On Mon, 25 Aug 2008 15:21:55 +0100 Stephen Gran <sgran at debian.org> wrote:
>This one time, at band camp, Stephen Gran said:
>> I'd prefer to use 
>> 
>> master            (unstable)
>> $release          (which is branched at freeze time)
>> volatile/$release (which is branched from $release at freeze time, but
>>                    tracks master)
>> pristine-tar      (see below)
>
>I've just had another thought that this may not be quite enough - we
>look likely to have some Ubuntu branches in there as well, and while
>it's unlikely to have overlapping names, it seems easy enough to make
>sure we can't by using:
>
>master          
>debian/unstable
>debian/$release
>debian/$release-volatile
>pristine-tar
>ubuntu/trunk (???)
>ubuntu/hardy
>ubunut/hardy-backports
>
>etc.  Does that seem reasonable?  Am I forgetting something that should
>probably go in?  I suspect that with the above layout, 'master' will
>basically just track the upstream release, and we'll do development of
>the debian/ directory in the debian/unstable branch for Debian and
>ubuntu/trunk for Ubuntu.  This has the advantage that when Debian makes
>a set of changes in unstable (pulls new upstream release, fixes a few
>bugs in maintainer scripts, etc) Ubuntu can just merge, and vice versa.
>
Currently we generally sync clamav from Unstable and use it unchanged, so as long as I can go 
back and branch from a particular Debian upload, I expect we'll mostly be working from the same 
packaging branch (work jointly on debian/unstable and then branch off when 
Ubuntu releases would be the general idea).  

Scott K



More information about the Pkg-clamav-devel mailing list