[SCM] FFmpeg packaging branch, master, updated. upstream/0.svn20090128-58-g5d7f791

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 5d7f7913493936542f6ce9facbb7d3a90ec7ca9c
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Feb 4 10:14:30 2009 +0100

    updates and fixes with a dryrun on fuddl at debian.org's laptop.

diff --git a/debian/README.upstream-upgrade b/debian/README.upstream-upgrade
index e36e1e4..9f8a2b2 100644
--- a/debian/README.upstream-upgrade
+++ b/debian/README.upstream-upgrade
@@ -1,6 +1,10 @@
 
 Checklist and howto for ffmpeg upstream upgrades:
 
+Needed packages:
+
+  apt-get install devscripts git-buildpackage, pristine-tar
+
 Stage in a tmp directory:
 
   mkdir /tmp/f ; cd /tmp/f
@@ -33,6 +37,8 @@ The following commands are intended to be copy&pastable.
             --upstream-tag=upstream.unstripped/0.svn${SVNDATE}-unstripped \
             --upstream-version=0.svn${SVNDATE}-unstripped \
             ../ffmpeg_0.svn${SVNDATE}.orig.tar.gz'
+ - run 'git checkout master.unstripped'
+ - run 'git merge master'
  - resolve the conflicts, hopefully the only conflict is in debian/changelog
    NB: libavcodec/allcodecs.c must match upstream.unstripped!
  - run 'git checkout master'
@@ -40,5 +46,4 @@ The following commands are intended to be copy&pastable.
    - headers in the -dev packages with 
    - soname in the libraries
    - formats.txt in the libavcodecs package
- - run 'git merge master'
 

-- 
FFmpeg packaging