From d5ea00fb9e74c90cad5d04951587b48055679b1b Mon Sep 17 00:00:00 2001 From: Alessio Treglia Date: Fri, 16 Nov 2012 12:06:08 +0000 Subject: [PATCH] Set get-orig-source back to retrieve sources from SVN. --- debian/gpac-get-orig-source | 3 ++- debian/rules | 7 ++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/debian/gpac-get-orig-source b/debian/gpac-get-orig-source index fad86fb..7bf189f 100755 --- a/debian/gpac-get-orig-source +++ b/debian/gpac-get-orig-source @@ -5,7 +5,8 @@ set -e # Script used to generate the orig source tarball for gpac. GPAC_SVN_URL="http://gpac.svn.sourceforge.net/svnroot/gpac/trunk/gpac" -GPAC_VERSION="0.4.5+svn${GPAC_SVN_REVISION}" +GPAC_BASE_VER="${GPAC_BASE_VER:-0.5.0}" +GPAC_VERSION="${GPAC_BASE_VER}+svn${GPAC_SVN_REVISION}" svn export -r "$GPAC_SVN_REVISION" "$GPAC_SVN_URL" "gpac-${GPAC_VERSION}" 1>/dev/null 2>&1 diff --git a/debian/rules b/debian/rules index 8bb36f2..a8478ff 100755 --- a/debian/rules +++ b/debian/rules @@ -3,7 +3,8 @@ export REPACK_SH=$(CURDIR)/debian/repack.sh DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) -export GPAC_SVN_REVISION ?= $(shell dpkg-parsechangelog | grep Version | sed 's/Version:.*+svn\([0-9]\+\).*/\1/') +export GPAC_BASE_VER ?= $(shell dpkg-parsechangelog | sed -n 's/Version: \([0-9.]*\)\+.*/\1/p') +#export GPAC_SVN_REVISION ?= $(shell dpkg-parsechangelog | grep Version | sed 's/Version:.*+svn\([0-9]\+\).*/\1/') ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS))) DEB_CONFIGURE_EXTRA_FLAGS = --disable-opt @@ -49,5 +50,5 @@ override_dh_strip: get-orig-source: # Use external script -# sh debian/repack.stub `$(dir $_)gpac-$@` - uscan --force-download + sh debian/repack.stub `$(dir $_)gpac-$@` +# uscan --force-download -- 2.30.2