[javamail] 03/04: Modified get-orig-source to work with the latest 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 javamail.

commit d9d022e639194586c547c3b8026ee64cffe40a1f
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Aug 26 08:45:51 2014 +0200

    Modified get-orig-source to work with the latest uscan
---
 debian/changelog   | 1 +
 debian/orig-tar.sh | 4 ++--
 debian/rules       | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8d15702..1900199 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ javamail (1.5.2-1) UNRELEASED; urgency=medium
 
   * New upstream release
     - Removed 03-change-test-ports.patch (fixed upstream)
+  * debian/rules: Modified get-orig-source to work with the latest uscan
 
  -- Emmanuel Bourg <ebourg at apache.org>  Mon, 25 Aug 2014 23:27:13 +0200
 
diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh
index 372f3e3..c9862db 100755
--- a/debian/orig-tar.sh
+++ b/debian/orig-tar.sh
@@ -5,8 +5,8 @@ TAR=../javamail_$VERSION.orig.tar.xz
 DIR=javamail-$VERSION
 
 mkdir -p $DIR
-unzip $3 -d $DIR
-rm $3
+unzip ../$3 -d $DIR
+rm ../$3
 XZ_OPT=--best tar -c -J -f $TAR $DIR
 rm -rf $DIR
 
diff --git a/debian/rules b/debian/rules
index 6f39e12..3285c36 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,4 +10,4 @@ DEB_MAVEN_DOC_TARGET   := javadoc:javadoc javadoc:aggregate
 DEB_INSTALL_CHANGELOGS_ALL := doc/release/CHANGES.txt
 
 get-orig-source:
-	uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename
+	uscan --download-current-version --force-download --no-symlink

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