[med-svn] r9078 - trunk/packages/sofa-framework/trunk/debian

[Andreas Tille]

Author: tille
Date: 2011-12-22 08:20:00 +0000 (Thu, 22 Dec 2011)
New Revision: 9078

Modified:
   trunk/packages/sofa-framework/trunk/debian/get-orig-source
Log:
Regard dversionmangle in get-orig-source if called manually and not via uscan; only uscan fetches first zip file automatically - we need to fetch it explicitely when get-orig-source is executed manually


Modified: trunk/packages/sofa-framework/trunk/debian/get-orig-source
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/get-orig-source	2011-12-22 08:16:57 UTC (rev 9077)
+++ trunk/packages/sofa-framework/trunk/debian/get-orig-source	2011-12-22 08:20:00 UTC (rev 9078)
@@ -2,10 +2,13 @@
 # get source for sofa-framework which assembles sofa-framework, sofa-modules and sofa-applications
 
 set -e
+# set -x
 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/'`
+    # regard dversionmangle
+    VERSION=`echo ${VERSION} | sed 's/\([0-9]\)~\([br]\)/\1-\2/'`
 else
     VERSION=`echo $@ | sed 's?^.*--upstream-version \([-0-9.rcbeta]\+\) .*sofa-framework.*?\1?'`
     if echo "$VERSION" | grep -q "upstream-version" ; then
@@ -14,13 +17,18 @@
     fi
 fi
 
+
 TARBALLDIR=../tarballs
 mkdir -p ${TARBALLDIR}
-mv ../${NAME}-${VERSION}.zip ${TARBALLDIR}
 
 indexpage=`grep www.sofa-framework.org debian/watch | sed 's/^.*\(http:[^[:space:]]\+\)[[:space:]].*$/\1/'`
 cd ${TARBALLDIR}
 wget -q -N "$indexpage"
+if [ -e ../${NAME}-${VERSION}.zip ] ; then
+    mv ../${NAME}-${VERSION}.zip .
+else
+    wget -q -N `grep framework.*\.zip download | sed "s?^.*\(https://gforge.inria.fr/frs/download.php/[0-9]\+/sofa-framework-${VERSION}\.zip\).*?\1?"`
+fi
 wget -q -N `grep modules.*\.zip download | sed "s?^.*\(https://gforge.inria.fr/frs/download.php/[0-9]\+/sofa-modules-${VERSION}\.zip\).*?\1?"`
 wget -q -N `grep applications.*\.zip download | sed "s?^.*\(https://gforge.inria.fr/frs/download.php/[0-9]\+/sofa-applications-${VERSION}\.zip\).*?\1?"`
 rm download