[svnkit] 01/01: debian/orig-tar.sh: Use the version passed by uscan instead of the current version

[Emmanuel Bourg]

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

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

commit 40de48c8204a62088de169fcb5be654014b94c93
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Oct 17 14:57:06 2014 +0200

    debian/orig-tar.sh: Use the version passed by uscan instead of the current version
---
 debian/changelog   | 4 +++-
 debian/orig-tar.sh | 6 +++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e22b76a..6ef1f73 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,7 +4,9 @@ svnkit (1.8.5+dfsg-3) UNRELEASED; urgency=medium
   * Removed the unnecessary Maven dependency on net.java.dev.jna:platform
     and com.jcraft:jsch.agentproxy.* (this broke libshib-common-java,
     see #752964)
-  * Use XZ compression for the upstream tarball
+  * debian/orig-tar.sh:
+    - Use XZ compression for the upstream tarball
+    - Use the version passed by uscan instead of the current version
   * Standards-Version updated to 3.9.6 (no changes)
 
  -- Emmanuel Bourg <ebourg at apache.org>  Fri, 17 Oct 2014 13:59:10 +0200
diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh
index 07dbe98..cd26a62 100755
--- a/debian/orig-tar.sh
+++ b/debian/orig-tar.sh
@@ -3,11 +3,11 @@
 set -e
 
 # called by uscan with '--upstream-version' <version> <file>
-echo "version $2"
+VERSION=$2
 package=`dpkg-parsechangelog | sed -n 's/^Source: //p'`
 debian_version=`dpkg-parsechangelog | sed -ne 's/^Version: \(.*+dfsg\)-.*/\1/p'`
-TAR=${package}_${debian_version}.orig.tar.xz
-DIR=${package}-${debian_version}.orig
+TAR=../${package}_${VERSION}.orig.tar.xz
+DIR=${package}-${VERSION}.orig
 
 # clean up the upstream tarball
 unzip -d orig $3

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