[Pkg-clamav-devel] OK, is it just me?

[Stephen Gran]

This one time, at band camp, Stephen Gran said:
> What I've done is added the 0.94 branch to our git tree, cloned it
> into a new branch 'test' and cherry-picked all of my commits I can
> find.  What remains to be done is to go over test and debian/unstable
> carefully and make sure I didn't miss any commits.  If so, cherry-pick
> them in.

This is done (thanks for checking it!)

> When that's done, a diff against the upstream needs to be done - they
> frequently don't release what's in svn, so we can't just hope that it
> will be the same.  If there are differences, I tend to push them in as
> a monolithic patch, so it's easier to revert later if need be.

I'm pushing this now.

> Once we're sure that what we have in git matches both the tarball and
> previous debian changes, we're almost there, but we still have some
> work to do.  We have to make sure the .[ch] files are actually gone
> from libclamunrar/ (both in our tree and in a repacked tarball).  I've
> done this before, so it should either be already done in the test
> branch, or can be cherry-picked.  

This is done now as well.

> Then we need to pristine-tar checkin the xdelta against the upstream
> tarball - this is probably easiest done by creating a new temporary
> branch from the 0.94 branch, cherry-picking the diff against the
> tarball, and then running pristine-tar against that.

I can take care of this as well.

> Finally, do the usual round of inspection of the BTS to fix any low
> hanging fruit or close any bugs closed upstream with this upload.
> Then feel free to upload to unstable.
> 
> For etch-volatile, lather/rinse repeat.  Or just branch
> debian/unstable to debian/etch-volatile and force it.  For
> etch-security, I don't see any new CVEs, but I do see some worrying
> entries in Changelog that should be evaluated.

Oh, and the question that occurs to me is, how do we get the contents of
the test branch back into debian/unstable in such a way that people who
have already cloned it can pull cleanly?  The only thing I can come up
with is running git revert $patch until I've rewound HEAD back to where
the 0.93 and 0.94 branches diverge, then git merge test.  This will
result in some really awful looking history, so if there's a better way
I'd like to know about it.

Cheers,
-- 
 -----------------------------------------------------------------
|   ,''`.                                            Stephen Gran |
|  : :' :                                        sgran at debian.org |
|  `. `'                        Debian user, admin, and developer |
|    `-                                     http://www.debian.org |
 -----------------------------------------------------------------
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: Digital signature
Url : http://lists.alioth.debian.org/pipermail/pkg-clamav-devel/attachments/20080904/dfb74887/attachment.pgp