[jtharness] 22/24: Fetch the latest releases from the upstream Mercurial repository

[Emmanuel Bourg]

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

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

commit fbe6a688b070abcf57a292612a7c17b57a0e6124
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Jun 18 17:42:12 2015 +0200

    Fetch the latest releases from the upstream Mercurial repository
---
 debian/changelog   |  2 ++
 debian/orig-tar.sh | 27 ++++++++++++++-------------
 debian/watch       |  3 +--
 3 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 87bfa00..a9b1dfa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ jtharness (4.6-1) UNRELEASED; urgency=medium
   * Moved the package to Git
   * debian/control:
     - Updated the Homepage field
+  * Updated debian/watch and debian/orig-tar.sh to fetch the latest tagged
+    build from the upsteam Mercurial repository.
   * debian/copyright: Updated the location of the source files
 
  -- Emmanuel Bourg <ebourg at apache.org>  Thu, 18 Jun 2015 16:24:10 +0200
diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh
index f926dde..0b1f6f7 100755
--- a/debian/orig-tar.sh
+++ b/debian/orig-tar.sh
@@ -1,22 +1,23 @@
-#!/bin/sh
-SOURCE=$(dpkg-parsechangelog | sed -ne 's,Source: \(.*\),\1,p')
+#!/bin/sh -e
+
+# called by uscan with '--upstream-version' <version> <file>
 VERSION=$2
-UNDERSCOREVERSION=$( echo $VERSION | sed 's/\./_/g')
-TAR=../${SOURCE}_${VERSION}.orig.tar.xz
-DIR=$SOURCE-$VERSION
+DIR=jtharness-${VERSION}
+TAR=../jtharness_${VERSION}.orig.tar.xz
 
-TAG=$( svn list https://svn.java.net/svn/jtharness~svn/tags | grep $UNDERSCOREVERSION )
-echo "Tag: $TAG"
+rm -Rf $3 $DIR
+mkdir $DIR
+wget http://hg.openjdk.java.net/code-tools/jtharness/archive/$VERSION.tar.gz
 
-svn export https://svn.java.net/svn/jtharness~svn/tags/$TAG/code/ $DIR
-XZ_OPT=--best tar -Jcf $TAR $DIR
-rm -rf $DIR $3
+tar xf $VERSION.tar.gz --strip-components=1 -C $DIR
+XZ_OPT=--best tar cJvf $TAR $DIR
+rm -Rf $DIR $VERSION.tar.gz
 
 # move to directory 'tarballs'
 if [ -r .svn/deb-layout ]; then
-  . .svn/deb-layout
-  mv $TAR $origDir
-  echo "moved $TAR to $origDir"
+    . .svn/deb-layout
+    mv $TAR $origDir
+    echo "moved $TAR to $origDir"
 fi
 
 exit 0
diff --git a/debian/watch b/debian/watch
index 20caf9f..a0c2986 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,2 @@
 version=3
-opts=uversionmangle=s/_([^-]+)/.$1.0/;s/bin/Rel/ \
-http://download.java.net/jtharness/download.html .*/jtharness/([\d\.]+)/Rel/.*\.zip debian debian/orig-tar.sh
+https://adopt-openjdk.ci.cloudbees.com/job/jtharness/lastSuccessfulBuild/artifact/jtharness-([\d\.]+).tar.gz debian debian/orig-tar.sh

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