[hessian] 06/07: Watch the versions in Maven Central instead of the Resin releases

[Emmanuel Bourg]

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

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

commit 5136f26cbfb172cbfcf5fca3d18873be071739a8
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Mar 31 12:19:39 2015 +0200

    Watch the versions in Maven Central instead of the Resin releases
---
 debian/changelog   |  3 ++-
 debian/orig-tar.sh | 20 +++++++++++---------
 debian/rules       |  2 +-
 debian/watch       |  3 +--
 4 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 35b3aea..ee792a9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,7 +3,8 @@ hessian (4.0.38-2) UNRELEASED; urgency=medium
   * Updated the dependency on the Servlet API (3.0 -> 3.1)
   * Removed the suggested dependency on libservlet3.0-java
   * Standards-Version updated to 3.9.6 (no changes)
-  * Updated the watch file
+  * debian/watch: Watch the versions in Maven Central instead of
+    the Resin releases
 
  -- Emmanuel Bourg <ebourg at apache.org>  Tue, 31 Mar 2015 11:31:11 +0200
 
diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh
index 4835d89..eb0e42c 100755
--- a/debian/orig-tar.sh
+++ b/debian/orig-tar.sh
@@ -1,18 +1,20 @@
-#!/bin/sh 
+#!/bin/sh
 
 set -e
 
 # called by uscan with '--upstream-version' <version> <file>
-echo "version $2"
-package=`dpkg-parsechangelog | sed -n 's/^Source: //p'`
-version=$2
-tarball=$3
-TAR=../${package}_${version}.orig.tar.xz
-DIR=${package}-${version}.orig
+PACKAGE=`dpkg-parsechangelog | sed -n 's/^Source: //p'`
+VERSION=$2
+TAR=../${PACKAGE}_${VERSION}.orig.tar.xz
+DIR=${PACKAGE}-${VERSION}.orig
 
-unzip $tarball -d $DIR
+rm -Rf $3
+
+wget http://caucho.com/download/hessian-$VERSION-src.jar
+unzip -d $DIR hessian-$VERSION-src.jar
+rm hessian-$VERSION-src.jar
 
 XZ_OPT=--best tar --numeric --group 0 --owner 0 -c -v -J -f $TAR \
     --exclude 'META-INF' --exclude **/test/** --exclude **/test  $DIR
 
-rm -rf $tarball $DIR
+rm -rf $DIR
diff --git a/debian/rules b/debian/rules
index c5ad2c5..7192579 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,7 +19,7 @@ override_dh_auto_clean:
 
 get-orig-source:
 	cd $(dir $(firstword $(MAKEFILE_LIST)))../ && \
-	uscan --force-download --download-version $(DEB_UPSTREAM_VERSION)
+	uscan --force-download --download-current-version --no-symlink
 
 get-orig-pom:
 	wget http://central.maven.org/maven2/com/caucho/hessian/$(DEB_UPSTREAM_VERSION)/hessian-$(DEB_UPSTREAM_VERSION).pom -O debian/pom.xml
diff --git a/debian/watch b/debian/watch
index 727c7c6..8e06897 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,2 @@
 version=3
-opts=downloadurlmangle=s/resin/hessian/;s/\.zip/-src\.jar/ \
-    http://caucho.com/products/resin/download/gpl .*/resin-([\d\.]+).zip debian debian/orig-tar.sh
+http://repo1.maven.org/maven2/com/caucho/hessian/ (\d[\d\.]+)/ debian debian/orig-tar.sh

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