[SCM] mplayer packaging branch, master, updated. upstream/0.svn20090303-80-g39b9bb3

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 0b6e05f5387ae8ce03b76e3c70b6b27564c41f57
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Mar 7 21:02:26 2009 +0100

    make the git-import-orig calls actually work
    
     - '~' are not allowed in git tags
     - --upstream-version is necesary for the first call as well

diff --git a/debian/README.upstream-upgrade b/debian/README.upstream-upgrade
index ef3549d..9370587 100644
--- a/debian/README.upstream-upgrade
+++ b/debian/README.upstream-upgrade
@@ -25,7 +25,8 @@ Fetch and commit the new upstream version:
             --upstream-branch=upstream \
             --pristine-tar \
             --no-dch \
-            --upstream-tag=upstream/1.0~rc2+svn${SVNDATE} \
+            --upstream-version=1.0~rc2+svn${SVNDATE} \
+            --upstream-tag=upstream/1.0rc2+svn${SVNDATE} \
             ../mplayer_1.0~rc2+svn${SVNDATE}.orig.tar.gz
 
   git checkout master.unstripped
@@ -34,7 +35,7 @@ Fetch and commit the new upstream version:
             --upstream-branch=upstream.unstripped \
             --pristine-tar \
             --no-dch \
-            --upstream-tag=upstream.unstripped/1.0~rc2+svn${SVNDATE}-unstripped \
+            --upstream-tag=upstream.unstripped/1.0rc2+svn${SVNDATE}-unstripped \
             --upstream-version=1.0~rc2+svn${SVNDATE}-unstripped \
             ../mplayer-non-dfsg_1.0~rc2+svn${SVNDATE}.orig.tar.gz
 

-- 
mplayer packaging