[SCM] FFmpeg packaging branch, master, updated. debian/0.5+svn20090609-2-12-gcd842cb

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 02ed2b15d992a28b927f6dfa3c4d164c75ac45b4
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Thu Aug 13 12:30:37 2009 +0200

    simplify README.upstream-upgrade
    
    we no longer maintain an seperate upstream.unstripped branch. All
    unstripped sources can now be found in the 'main' upstream branch.

diff --git a/debian/README.upstream-upgrade b/debian/README.upstream-upgrade
index ed2bc8b..ab58771 100644
--- a/debian/README.upstream-upgrade
+++ b/debian/README.upstream-upgrade
@@ -22,30 +22,11 @@ Fetch and commit the new upstream version:
 
   debian/rules get-orig-source SVN_VERSION=${SVNDATE}
   git-import-orig \
-            --debian-branch=master \
-            --upstream-branch=upstream \
-            --pristine-tar \
 	    --no-dch \
             --upstream-tag=upstream/0.5+svn${SVNDATE} \
             --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 \
-            --upstream-branch=upstream.unstripped \
-            --pristine-tar \
-	    --no-dch \
-            --upstream-tag=upstream.unstripped/0.5+svn${SVNDATE} \
-            --upstream-version=0.5+svn${SVNDATE} \
             ../ffmpeg_0.5+svn${SVNDATE}.orig.tar.gz
 
-  git checkout master
-
 Check and note the svn revision numbers from
 ffmpeg/{libswscale,}.svnrevision in debian/changelog
 
@@ -59,11 +40,3 @@ Build, test, and compare against the the version already in the archive:
   - formats.txt in the libavcodecs package
 
 Finialize debian/changelog, package should be upload ready now
-
-Merge improvements and changes from master branch to master.unstripped:
-
-  git checkout master.unstripped
-  git merge master
-
-Resolve the conflicts, hopefully the only conflict is in debian/changelog
-   NB: libavcodec/allcodecs.c must match upstream.unstripped!

-- 
FFmpeg packaging