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

[fsateler-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit b30a3a47defa25e0b40993076f05c2178699d326
Author: Felipe Sateler <fsateler at gmail.com>
Date:   Thu Jun 4 20:14:42 2009 +1000

    Don't add -unstripped to the unstripped variant version number
    
    The source package for the stripped and unstripped versions differ,
    so there is no need to change the upstream version. It also confused
    git-buildpackage + pristine-tar

diff --git a/debian/README.upstream-upgrade b/debian/README.upstream-upgrade
index 382b3a2..b71cc10 100644
--- a/debian/README.upstream-upgrade
+++ b/debian/README.upstream-upgrade
@@ -35,8 +35,8 @@ Fetch and commit the new upstream version:
             --upstream-branch=upstream.unstripped \
             --pristine-tar \
 	    --no-dch \
-            --upstream-tag=upstream.unstripped/0.5+svn${SVNDATE}-unstripped \
-            --upstream-version=0.5+svn${SVNDATE}-unstripped \
+            --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

-- 
FFmpeg packaging