[libspring-java] 09/19: debian/rules: Changed the get-orig-source target to call uscan

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository libspring-java.

commit e0c434a752eb905b318d61bd48f657c6c2bcccda
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Dec 3 13:33:10 2014 +0100

    debian/rules: Changed the get-orig-source target to call uscan
---
 debian/changelog   | 1 +
 debian/orig-tar.sh | 4 ++--
 debian/rules       | 6 +-----
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 74eb894..496c924 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ libspring-java (3.2.12-1) UNRELEASED; urgency=medium
     - Removed the patches applied upstream
   * Use XZ compression for the upstream tarball
   * Remove more jar files from the upstream tarball
+  * debian/rules: Changed the get-orig-source target to call uscan
 
  -- Emmanuel Bourg <ebourg at apache.org>  Wed, 26 Nov 2014 14:06:24 +0100
 
diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh
index 485fd15..b82eb9d 100755
--- a/debian/orig-tar.sh
+++ b/debian/orig-tar.sh
@@ -3,11 +3,11 @@
 # called by uscan with '--upstream-version' <version> <file>
 VERSION=$2
 DIR=spring-framework-$VERSION
-TAR=libspring-java_$VERSION.orig.tar.xz
+TAR=../libspring-java_$VERSION.orig.tar.xz
 
-echo ""tar -xf $3 --strip-components=1 -C $DIR
 mkdir $DIR
 tar -xf $3 --strip-components=1 -C $DIR
+rm $3
 XZ_OPT=--best tar cJvf $TAR \
     --exclude '*.jar' \
     --exclude '*.class' \
diff --git a/debian/rules b/debian/rules
index 667f16c..2182d23 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,6 @@
 #!/usr/bin/make -f
 
 PACKAGE := $(shell dpkg-parsechangelog | grep '^Source:' | cut -f 2 -d ' ')
-VERSION := $(shell dpkg-parsechangelog | grep '^Version:' | cut -f 2 -d ' ' | sed 's/-[^-]*$$//')
 
 JAVA_HOME       := /usr/lib/jvm/default-java
 ANT_ARGS        := -propertyfile debian/ant.properties
@@ -45,8 +44,5 @@ override_dh_auto_install:
 	mh_installpom -plibspring-instrument-java $(PRJ_ROOT).instrument.tomcat/pom.xml
 	mh_installjar -plibspring-instrument-java -nspring3-instrument-tomcat -i3.x -l $(PRJ_ROOT).instrument.tomcat/pom.xml $(PRJ_ROOT).instrument.tomcat/$(ARTIFACT_ROOT).instrument.tomcat.jar
 
-# Make a Debian version of upstream tarball
-# Details given in README.source
 get-orig-source:
-	wget -O ../spring-framework.zip http://s3.amazonaws.com/dist.springframework.org/release/SPR/spring-framework-${VERSION}-with-docs.zip
-	debian/orig-tar.sh --upstream-version ${VERSION} ../spring-framework.zip
+	uscan --download-current-version --rename --force-download

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libspring-java.git