[Pkg-clamav-devel] Packaging 0.95.3

[Michael Tautschnig]

> Hi all,
> 
> I'd just like to seek some coordination for packaging the new upstream release.
> As it wouldn't be the first time I do this, I should manage to get the new stuff
> merged in our git repository. I should be able to find some time to do so on
> Saturday, unless someone else steps up and prefers to do it themselves.
> 

[...]

It was suggested that I list the steps that it took to get a new release
packaged.  I'm using the recipe Stephen gave earlier [1], but some of those
steps need some tweaking. Furthermore, upstream switched to git.

As a prerequisite, the following steps assume you have previously done:

git clone ssh://git.debian.org/git/pkg-clamav/clamav.git clamav.git
cd clamav.git
git remote add clamav-devel http://git.clamav.net/clamav-devel.git
git checkout -t -b debian/unstable origin/debian/unstable
git checkout -t -b debian/lenny-volatile origin/debian/lenny-volatile

Ok, let's rock:

cd clamav.git
git remote update
git checkout debian/unstable
git pull --rebase
git merge clamav-0.95.3
# this time, the results are fairly bad because git doesn't know that we had
# already merged a lot from clamav-0.95.2; it shouldn't be as bad with the next
# release, I assume
git mergetool -t vimdiff
# in the background, several times I used
# ls *.REMOTE.* | sed "s/\(\(.*\).REMOTE.*\)/cp \1 \2/g" | sh
git diff clamav-0.95.3 --stat
# apart from the debian/ directory this lists the following changes:
# docs/man/clamd.conf.5.in                       |    2 +-
# (one hyphen error)
# etc/clamav-milter.conf                         |    5 +-
# etc/clamd.conf                                 |    6 +-
# etc/freshclam.conf                             |    4 +-
# (Debian specific paths)
# in case other differences are spotted, check them and git add/rm those files
git commit
git checkout -t -b upstream/0.95.3 clamav-0.95.3
cd ..
wget 'http://downloads.sourceforge.net/project/clamav/clamav/0.95.3/clamav-0.95.3.tar.gz?use_mirror=surfnet' -O clamav-0.95.3.tar.gz
clamav.git/contrib/split-tarball.sh . 0.95.3
# prepare updated libclamunrar package, if you prefer
tar xzf clamav_0.95.3+dfsg.orig.tar.gz
cd clamav.git
git checkout debian/unstable
cd ..
diff -urN -x.git -x.gitignore -x.gitattributes -xdebian clamav-0.95.3+dfsg/ clamav.git/ | diffstat
git rm -r libclamunrar/*.[ch] contrib/Windows/
git rm libclamunrar/libclamunrar.map
git rm -r contrib/DJGPP/ contrib/checking/ contrib/clamavmon/ 
git rm -r contrib/clamd_fdscan/ contrib/entitynorm/ contrib/mpoolparse/
git rm -r contrib/optimize/ contrib/phishing/ contrib/test/
git rm unit_tests/{duma,efence,valgrind}_tests.sh
git commit
# we should only need to do this once
cp ../clamav-0.95.3+dfsg/Makefile.{am,in} .
cp ../clamav-0.95.3+dfsg/database/*.cvd database/
git commit
git checkout -t -b upstream/0.95.3+tarball upstream/0.95.3
git cherry-pick 70cf8f35661803e8cade92ed3bd46a2e06306053
git cherry-pick fe872547d773c326ac825e3beca2f8c64be83211
git cherry-pick ca0a749f21cfa74726d63541e9daccfbfe019727
git cherry-pick 2ef631fffce2053d27619f01bea8a58cec650c8c
cd ..
diff -urN -x.git -x.gitignore -x.gitattributes -xdebian clamav-0.95.3+dfsg/ clamav.git/ | diffstat
# 0 files changed
pristine-tar commit ../clamav_0.95.3+dfsg.orig.tar.gz 2a488e86f6d9ec019b7facbed15163faf9c1381a
git checkout debian/unstable
git diff upstream/0.95.3+tarball --stat
# should only list the changes described above
# check bugs at http://bugs.debian.org/src:clamav
vim debian/changelog
# add new changelog entry, you may want to use dch -i instead
git commit debian/changelog
git checkout debian/lenny-volatile
git merge debian/unstable
git mergetool -t vimdiff
git commit
git diff debian/unstable --stat
# debian/NEWS.Debian |    2 +-
# debian/changelog   |  117 +++++++++++++++------------------------------------
# (these are to be expected)
# debian/control     |    2 +-
# (lenny still needs libltdl3-dev, not libltdl-dev)
git push --all --dry-run
git push --all
git checkout debian/unstable
dpkg-buildpackage -I'.git' -i'\.git'
cd ..
lintian -iI --pedantic *.deb *.dsc

Comments on this process are welcome, maybe we can together improve it or maybe
even come up with a partly-interactive script. 

I'll upload packages to unstable and volatile within an hour or so.

Best,
Michael

[1] http://lists.alioth.debian.org/pipermail/pkg-clamav-devel/2008-November/000179.html

-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://lists.alioth.debian.org/pipermail/pkg-clamav-devel/attachments/20091102/fde6937c/attachment.pgp>