ffmpeg package moved over to git.debian.org

[Reinhard Tartler]

Hi folks! (escp. Fabian and Loïc!)

I've now finished moving the ffmpeg package from svn to git. I've been
pondering for quite a while how to do the conversion, but in the end
I've come to the conclusion that importing the old packages is the only
way to do that sanely. If we want the old svn commits to be imported as
well, I think we should do that on the basis of the package imports:


 p----p----p--- (debian package imports)
  \    \
   s   s
   |
   s ( svn imports )

This would leave a lot of otherwise useless heads. Perhaps as some
optimisation, we could create 'fake' merges to the next import. Which
would catch up all heads and we have a somewhat sane history again. But
what to do if a conflict appears here (read: a divergence between what's
in the debian archive and in svn? - since I've been rather lax with svn
tagging, I suspect that this is not entirely unlikely).

OTOH, having the old svn history might not be that important after
all. we now have a branch where we can checkout earlier version of the
ffmpeg-debian package and let's be good with it. Oh, I've imported only
after we renamed the source package to ffmpeg-debian. So the etch
version is not available. sorry.

Anyway, I've introduced the following branches:

  master       : current trunk. goes to experimental
  pristine-tar : information for pristine-tar(1)
  unstable     : branch for the lenny package
  upstream     : imports of the generated orig.tar.gz packages


Process for updating to a new upstream version:

 - edit debian/changelog
 - bump the version to the version you want to import
 - run 'debian/rules get-orig-source'
 - run 'git-import-orig --debian-branch=$branch ../ffmpeg-XXX.orig.tar.gz'

perhaps this 'howto' should go to wiki.debian.org?


-- 
Gruesse/greetings,
Reinhard Tartler, KeyID 945348A4