[SCM] FFmpeg packaging branch, master.snapshot, updated. debian/0.5+svn20090706-5-23-gdb06836

[siretart at users.alioth.debian.org]

The following commit has been merged in the master.snapshot branch:
commit 45fbfefc6631ea21c8e5b4d654cc596f327719f0
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed May 5 21:56:57 2010 +0200

    track 0.6 release branch (not released yet!)

diff --git a/debian/README.upstream-upgrade b/debian/README.upstream-upgrade
index e46804d..1710b8e 100644
--- a/debian/README.upstream-upgrade
+++ b/debian/README.upstream-upgrade
@@ -8,8 +8,8 @@ Needed packages:
 Stage in a tmp directory:
 
   mkdir /tmp/f ; cd /tmp/f
-  git clone git://git.debian.org/git/pkg-multimedia/ffmpeg-debian.git
-  cd ffmpeg-debian
+  git clone git://git.debian.org/git/pkg-multimedia/ffmpeg.git
+  cd ffmpeg
   branches="master.unstripped pristine-tar upstream upstream.unstripped"
   for b in $branches; do git checkout -b $b origin/$b ; done
 
@@ -21,7 +21,7 @@ Prepare the environment:
 Fetch and commit the new upstream version:
 
   debian/rules get-orig-source SVN_VERSION=${SVNDATE}
-  git-import-orig ../ffmpeg_0.6~~svn${SVNDATE}.orig.tar.gz
+  git-import-orig ../ffmpeg_0.6~svn${SVNDATE}.orig.tar.gz
 
 Check and note the svn revision numbers from
 ffmpeg/{libswscale,}.svnrevision in debian/changelog
diff --git a/debian/get-orig-source.sh b/debian/get-orig-source.sh
index 28c1784..614e401 100644
--- a/debian/get-orig-source.sh
+++ b/debian/get-orig-source.sh
@@ -66,13 +66,13 @@ if [ -z $SVNDATE ]; then
 	error "you need to specify an svn date. e.g. 20081230 for Dec 29. 2008"
 fi
 
-TARBALL=../ffmpeg_0.6~~svn${SVNDATE}.orig.tar.gz
+TARBALL=../ffmpeg_0.6~svn${SVNDATE}.orig.tar.gz
 PACKAGENAME=ffmpeg
 
 TMPDIR=`mktemp -d`
 trap 'rm -rf ${TMPDIR}'  EXIT
 
-baseurl="svn://svn.ffmpeg.org/ffmpeg/trunk"
+baseurl="svn://svn.ffmpeg.org/ffmpeg/branches/0.6"
 
 svn export -r{${SVNDATE}} \
 	--ignore-externals \
@@ -84,16 +84,5 @@ svn info -r{${SVNDATE}} \
 	| awk '/^Revision/ {print $2}' \
 	> ${TMPDIR}/${PACKAGENAME}/.svnrevision
 
-# get svn externals
-svn pg svn:externals -r{${SVNDATE}} $baseurl | \
-while read external url; do
-    [ -z $url ] && continue
-    dest="${TMPDIR}/${PACKAGENAME}/${external}"
-    svn export -r{${SVNDATE}} --ignore-externals $url $dest
-    svn info $url -r{${SVNDATE}} \
-      | awk '/^Revision/ {print $2}' \
-      > ${TMPDIR}/${PACKAGENAME}/${external}/.svnrevision
-done
-
 tar czf ${TARBALL} -C ${TMPDIR} ${PACKAGENAME}
 

-- 
FFmpeg packaging