I started toying around with 96-rc1 and I'm bit confused at some of the steps.
For the sake of resurrecting ancient threads... On Mon, Nov 02, 2009 at 05:06:09PM +0100, Michael Tautschnig wrote: > 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 The remote clamav-devel is never really used later in the process, however an upstream/xxx branch is. Was the branch the result of pulling from clamav-devel and pushing into origin? E.g. git checkout -b xxx remotes/clamav-devel/xxx git push origin xxx upstream/xxx BTW the clamav git is also available over git protocol: git://git.clamav.net/git/clamav-devel > 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 Are there any local changes expected at this point to be rebased?? > git merge clamav-0.95.3 The local clamav-0.95.3 comes out of nowhere. Is it a local branch tracking upstream/0.95.3 ? Or remotes/clamav-devel/xxx ? Or as guessed above these are really the same thing ? > git mergetool -t vimdiff [...] > 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 How is clamav_0.95.3+dfsg.orig.tar.gz generated? > 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 Is there really anything in contrib we want to ship? > git commit The rest of the process looks fine. Thanks, -aCaB _______________________________________________ Pkg-clamav-devel mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-clamav-devel
