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

[Stephen Gran]

This one time, at band camp, Stephen Gran said:
> Are there any git gurus lurking around?  I'm having trouble pulling the
> new upstream version into git, and I think it's because upstream has
> done some very wierd branching.

OK, I think I've figured out the problem.  Upstread did version control
like this:

     master
        |
0.94    |
 |      |
 |      |
 | 0.93 |
 |  |   |
 |  |   |
 \__\___|

So there was no common ancestor to merge the current debian/unstable and
the current head of the 0.94 branch (or there was, but there were lots
of changes since - so lots of conflicts also).

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.

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.

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.  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.

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.

I'm out of time for the evening, so if anyone wants to get started on
this tasklist, that would be great.

Thanks,
-- 
 -----------------------------------------------------------------
|   ,''`.                                            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/20080903/cb62d444/attachment.pgp