[med-svn] [rambo-k] 01/06: Upstream says using r5 instead of r8 (latest) should work without Genious code

[Andreas Tille]

This is an automated email from the git hooks/post-receive script.

tille pushed a commit to branch master
in repository rambo-k.

commit c72ba3bf7275606650df44c922e6e05d460d5afc
Author: Andreas Tille <tille at debian.org>
Date:   Tue Oct 25 19:07:36 2016 +0200

    Upstream says using r5 instead of r8 (latest) should work without Genious code
---
 debian/get-orig-source | 29 +++++++++++++----------------
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git a/debian/get-orig-source b/debian/get-orig-source
index 4710bb3..6220fa4 100755
--- a/debian/get-orig-source
+++ b/debian/get-orig-source
@@ -13,16 +13,10 @@ COMPRESS=xz
 
 NAME=`dpkg-parsechangelog | awk '/^Source/ { print $2 }'`
 
-if ! echo $@ | grep -q upstream-version ; then
-    VERSION=`dpkg-parsechangelog | awk '/^Version:/ { print $2 }' | sed 's/\([0-9\.]\+\)-[0-9]\+$/\1/'`
-    uscan --force-download
-else
-    VERSION=`echo $@ | sed "s?^.*--upstream-version \([0-9.]\+\) .*${NAME}.*?\1?"`
-    if echo "$VERSION" | grep -q "upstream-version" ; then
-        echo "Unable to parse version number"
-        exit
-    fi
-fi
+VERSION=`dpkg-parsechangelog | awk '/^Version:/ { print $2 }' | sed 's/^\([+0-9\.r]\+\)-[0-9]\+$/\1/'`
+SVNREVISION=`echo $VERSION | sed 's/^.*+r/-r/'`
+DOWNLOADVERSION=`echo $VERSION | sed 's/^\(.*\)+r.*/\1/'`
+DOWNLOADARCHIVE=RAMBOK_${DOWNLOADVERSION}.zip
 
 set -e
 
@@ -33,14 +27,18 @@ TARDIR=${NAME}-${VERSION}
 
 mkdir -p ../tarballs
 cd ../tarballs
+rm -rf ${TARDIR}
+
+# code is a mix from download archive + SVN - sorry, I discussed with upstream about this :-(
+wget --no-clobber --quiet https://qa.debian.org/watch/sf.php/rambok/${DOWNLOADARCHIVE}
+
 # svn export conserves time stamps of the files, checkout does not
-LC_ALL=C svn --quiet export ${SVNURI} rambok-code
-mkdir ${TARDIR}
+LC_ALL=C svn --quiet export ${SVNREVISION} ${SVNURI} ${TARDIR}
+
 cd ${TARDIR}
-mv ../rambok-code/* .
-rmdir ../rambok-code
+
 rm -rf wrappers
-unzip -o -q ../../RAMBOK_${VERSION}.zip
+unzip -o -q ../${DOWNLOADARCHIVE}
 find . -name "*.jar" -delete
 find . -name ".settings" -type d | xargs -r rm -rf
 find . -name "*.java" -exec chmod 644 \{\} \;
@@ -48,7 +46,6 @@ find . -name "*.log" -exec chmod 644 \{\} \;
 find . -name "*.txt" -exec chmod 644 \{\} \;
 find . -name ".[a-z]*" -exec chmod 644 \{\} \;
 cd ..
-rm -rf ../rambok-code
 
 GZIP="--best --no-name" tar --owner=root --group=root --mode=a+rX -caf "$NAME"_"$VERSION".orig.tar.${COMPRESS} "${TARDIR}"
 rm -rf ${TARDIR}

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/rambo-k.git