[SCM] FFmpeg packaging branch, master, updated. debian/0.5+svn20090420-2-55-ge079ef8

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 23d0060abe10c7ac094f775f5d4e28e7dd6815f3
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri Jul 3 23:40:58 2009 +0200

    adjust notes in README.upstream-upgrade for the now unstripped debian source package

diff --git a/debian/README.upstream-upgrade b/debian/README.upstream-upgrade
index 5f106d8..ed2bc8b 100644
--- a/debian/README.upstream-upgrade
+++ b/debian/README.upstream-upgrade
@@ -30,6 +30,10 @@ Fetch and commit the new upstream version:
             --upstream-version=0.5+svn${SVNDATE} \
             ../ffmpeg-debian_0.5+svn${SVNDATE}.orig.tar.gz
 
+  # ffmpeg (formerly ffmpeg-debian) and ffmpeg-extra share the same tarball now
+  cp ../ffmpeg-debian_0.5+svn${SVNDATE}.orig.tar.gz \
+     ../ffmpeg_0.5+svn${SVNDATE}.orig.tar.gz
+
   git checkout master.unstripped
   git-import-orig \
             --debian-branch=master.unstripped \

-- 
FFmpeg packaging