[jasypt] 04/09: Create the upstream tarball from the Subversion repository on SourceForge

[Emmanuel Bourg]

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

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

commit 6556a588ac9ab9f27abbad3b6efea70d63884b11
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed May 18 11:54:50 2016 +0200

    Create the upstream tarball from the Subversion repository on SourceForge
---
 debian/changelog   |  1 +
 debian/cvs-get.sh  | 18 ------------------
 debian/orig-tar.sh | 13 +++++++++++++
 debian/rules       |  2 +-
 debian/watch       |  2 +-
 5 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5419870..04869f4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ jasypt (1.8-4) UNRELEASED; urgency=medium
   * Build with the DH sequencer instead of CDBS
   * Standards-Version updated to 3.9.8 (no changes)
   * Use a secure Vcs-Git URL
+  * Create the upstream tarball from the Subversion repository on SourceForge
 
  -- Emmanuel Bourg <ebourg at apache.org>  Wed, 18 May 2016 09:44:50 +0200
 
diff --git a/debian/cvs-get.sh b/debian/cvs-get.sh
deleted file mode 100644
index 7d54b38..0000000
--- a/debian/cvs-get.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-set -e
-
-TMPDIR=`mktemp -t -d jaspyt-cvs.XXXXXXXXXX` || exit 1
-trap "rm -Rf $TMPDIR" 0
-VERSION=$(dpkg-parsechangelog | grep '^Version:' | cut -f 2 -d ' ' | sed "s/-\(.*\)$//")
-
-TAR=jasypt_$VERSION.orig.tar.gz
-DIR=jasypt-$VERSION
-TAG="jasypt-`echo $VERSION | tr . _`"
-CVSROOT=":pserver:anonymous at jasypt.cvs.sourceforge.net:/cvsroot/jasypt"
-
-echo "retrieving Jasypt sources tagged $TAG"
-(cd $TMPDIR && cvs -d $CVSROOT export -d $DIR -r$TAG jasypt >/dev/null 2>&1)
-
-echo "generating ../$TAR"
-tar -C $TMPDIR -czf ../$TAR $DIR
-
diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh
new file mode 100755
index 0000000..ff018c7
--- /dev/null
+++ b/debian/orig-tar.sh
@@ -0,0 +1,13 @@
+#!/bin/sh
+set -e
+
+PACKAGE=$(dpkg-parsechangelog -S Source)
+VERSION=$2
+DIR=${PACKAGE}-${VERSION}
+TAR=../${PACKAGE}_${VERSION}.orig.tar.xz
+
+rm $3
+svn export http://svn.code.sf.net/p/jasypt/code/tags/jasypt/jasypt-$VERSION $DIR
+
+XZ_OPT=--best tar -c -v -J -f $TAR $DIR
+rm -Rf $DIR
diff --git a/debian/rules b/debian/rules
index 239466f..aba914b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,4 +4,4 @@
 	dh $@ --buildsystem=maven
 
 get-orig-source:
-	sh debian/cvs-get.sh	
+	uscan --download-current-version --force-download --no-symlink
diff --git a/debian/watch b/debian/watch
index 876ecdd..53e2385 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
 version=3
-http://sf.net/jasypt/jasypt-([\d].+)-dist\.zip
+http://sf.net/jasypt/jasypt-([\d].+)-dist\.zip debian debian/orig-tar.sh

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