[SCM] mplayer/master: Update the get-orig-source routine.

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

The following commit has been merged in the master branch:
commit 6a14a4bfb75f232a359b241ed43a8a8df4afe955
Author: Miguel A. Colón Vélez <debian.micove at gmail.com>
Date:   Mon Oct 19 01:55:59 2015 -0400

    Update the get-orig-source routine.
    
    Be able to fetch stable releases from svn by tag.
    Gbp-Dch: Ignore

diff --git a/debian/get-svn-source.sh b/debian/get-svn-source.sh
index 269a7a3..1f825fb 100755
--- a/debian/get-svn-source.sh
+++ b/debian/get-svn-source.sh
@@ -3,45 +3,40 @@
 set -e
 
 PACKAGE=mplayer
-FFMPEG_CO=fc8db12a73f12377b56d8bf53cd6ce25968094c4
-giturl="http://git.videolan.org/?p=ffmpeg.git;a=blob_plain;f=libavutil/x86/asm.h;hb=${FFMPEG_CO}"
-svnurl=svn://svn.mplayerhq.hu/mplayer/trunk
-#svnurl=svn://svn.mplayerhq.hu/mplayer/branches/1.1
+svnurl=svn://svn.mplayerhq.hu/mplayer
+VER_SUFFIX=""
 
 CWD_DIR=${PWD}
 GOS_DIR=${CWD_DIR}/get-orig-source
 
 DEB_SOURCE=$(dpkg-parsechangelog 2>/dev/null | sed -n 's/^Source: //p')
 DEB_VERSION=$(dpkg-parsechangelog 2>/dev/null | sed -n 's/^Version: //p')
-UPSTREAM_VERSION=$(echo ${DEB_VERSION} | sed -r 's/[^:]+://; s/-[^-]+$$//')
+UPSTREAM_VERSION=$(echo ${DEB_VERSION} | sed -r 's/[^:]+://; s/-[^-]+$$//;s/\+dfsg[0-9]*$//;s/\+repack[0-9]*$//')
 SVN_VERSION=$(echo ${UPSTREAM_VERSION} | sed -nr 's/^[0-9.:-~]+\+svn([0-9]+)$$/\1/p')
 
 if [ "${DEB_SOURCE}" != "${PACKAGE}" ]; then
-	echo 'Please run this script from the sources root directory.'
-	exit 1
+    echo 'Please run this script from the sources root directory.'
+    exit 1
 fi
 
-if [ -z ${SVN_VERSION} ]; then
-	echo 'Please update the latest entry in the changelog to show a svn revision.'
-	exit 2
+if [ -z ${SVN_VERSION} ] && [ -z "${UPSTREAM_VERSION}" ]; then
+    echo 'Please update the latest entry in the changelog to show a valid version.'
+    exit 2
+elif [ -z ${SVN_VERSION} ]; then
+    svnurl="${svnurl}/tags/MPlayer-${UPSTREAM_VERSION}"
+else
+    svnurl="-r ${SVN_VERSION} ${svnurl}/trunk"
 fi
 
 rm -rf ${GOS_DIR}
 mkdir ${GOS_DIR} && cd ${GOS_DIR}
 
 # Download mplayer
-svn checkout --config-option config:miscellany:use-commit-times=yes -r ${SVN_VERSION} \
-	${svnurl} ${DEB_SOURCE}-${UPSTREAM_VERSION}
+svn checkout --config-option config:miscellany:use-commit-times=yes ${svnurl} ${DEB_SOURCE}-${UPSTREAM_VERSION}
 cd ${GOS_DIR}/${DEB_SOURCE}-${UPSTREAM_VERSION}
 if [ ! -e VERSION ]; then
-	echo ${UPSTREAM_VERSION} > VERSION
-	touch -h -d "$(svn propget --revprop -r ${SVN_VERSION} svn:date)" VERSION
-fi
-
-# Download ffmpeg (for libavutil/x86/asm.h)
-if [ ! -e ffmpeg ]; then
-	curl --create-dirs -o ffmpeg/libavutil/x86/asm.h "${giturl}"
-	touch -h -d "$(svn propget --revprop -r ${SVN_VERSION} svn:date)" ffmpeg/libavutil/x86/asm.h
+    echo ${UPSTREAM_VERSION} > VERSION
+    touch -h -d "$(svn propget --revprop -r ${SVN_VERSION} svn:date)" VERSION
 fi
 
 # Setting times...
@@ -50,12 +45,12 @@ for F in $(find -type l); do touch -h -r "$(readlink -e $F)" "$F"; done
 
 # Clean-up...
 cd ${GOS_DIR}/${DEB_SOURCE}-${UPSTREAM_VERSION}
-rm -rf .git*
+rm -f .gitignore
 find . -depth -type d -name ".svn" -exec rm -rf '{}' \;
 
 # Packing...
 cd ${GOS_DIR}
 find -L ${DEB_SOURCE}-${UPSTREAM_VERSION} -xdev -type f -print | LC_ALL=C sort \
-| XZ_OPT="-6v" tar -caf "${CWD_DIR}/${DEB_SOURCE}_${UPSTREAM_VERSION}.orig.tar.xz" -T- --owner=root --group=root --mode=a+rX
+| XZ_OPT="-6v" tar -caf "${CWD_DIR}/${DEB_SOURCE}_${UPSTREAM_VERSION}${VER_SUFFIX}.orig.tar.xz" -T- --owner=root --group=root --mode=a+rX
 
 cd ${CWD_DIR} && rm -rf ${GOS_DIR}

-- 
mplayer packaging