From: Alessio Treglia <alessio@debian.org>
Date: Fri, 16 Nov 2012 12:06:08 +0000 (+0000)
Subject: Set get-orig-source back to retrieve sources from SVN.
X-Git-Tag: archive/raspbian/1.0.1+dfsg1-4+rpi1~1^2~182
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=d5ea00fb9e74c90cad5d04951587b48055679b1b;p=gpac.git

Set get-orig-source back to retrieve sources from SVN.
---

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