[Pkg-clamav-devel] how I merged 0.94.1

[Stephen Gran]

After going around with this a few times on IRC, here's what I did to
get 0.94.1 into git.

This assumes that you have previously done
git clone ssh://git.debian.org/git/pkg-clamav/clamav.git
cd clamav
git remote add ssh://git.debian.org/var/lib/gforge/chroot/home/users/sgran/clamav-devel

Then you can do:
cd clamav 
git remote update
git checkout debian/unstable
git merge clamav-devel/tags/clamav-0.94.1
git mergetool
git cia
git branch clamav-devel/tags/clamav-0.94.1 upstream/0.94.1
cd ..
tar -xf clamav-0.94.1.tar.gz
cd clamav-0.94.1
rm libclamunrar/*.[ch]
cd ..
tar -xvzf clamav_0.94.dfsg.1.orig.tar.gz clamav-0.94.1
diff -Nru -x.git -xdebian clamav-0.94.1 clamav | diffstat
cp clamav-0.94.1/database/main.cvd clamav/database/main.cvd
cp clamav-0.94.1/database/daily.cvd clamav/database/daily.cvd
rm clamav/contrib/test/clam.bz2.zip
rm clamav/contrib/checking/build.sh 
rm clamav/contrib/test/clam.exe.html
cd clamav
git cia
git branch -b upstream/0.94.1+tarball upstream/0.94.1
git cherry-pick acbdd58bde22cff4781e4ce07e62702f2675faca
git checkout debian/unstable
diff <(git diff HEAD..HEAD^ | diffstat) <(git diff upstream/0.94.1..upstream/0.94.1+tarball | diffstat)
git checkout debian/etch-volatile
git merge debian/unstable
git checkout HEAD debian/changelog 
git checkout HEAD debian/control 
git cia
git log upstream/0.94.1+tarball 
pristine-tar commit ../clamav_0.94.dfsg.1.orig.tar.gz 207cf47acd45bd1b162b5ebf9d932a2009fc6a0e
dch -i
debuild -S
diffstat ../clamav_0.94.dfsg.1-1.diff.gz | grep -v debian
git push --dry-run --all
git push --all

Cheers all,
-- 
 -----------------------------------------------------------------
|   ,''`.                                            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/20081111/db784e27/attachment.pgp