> 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 >
No, clamav-devel is implicitly used as it provides the tag clamav-0.95.3, which is used in the merge below. [...] > > > > 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?? > Usually not, no. But it doesn't hurt doing so... > > 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 ? > No, this is a tag from clamav-devel.git. For 96-rc1 this is git merge clamav-0.96rc1 as git remote update just told me: From http://git.clamav.net/clamav-devel * [new tag] clamav-0.96rc1 -> clamav-0.96rc1 ... > > 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? > Using *your* script split-tarball.sh! :-) [...] Thanks a lot for going through all this process! Michael
pgpqoxR961tcg.pgp
Description: PGP signature
_______________________________________________ Pkg-clamav-devel mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-clamav-devel
