[sisu-ioc] 02/04: Fixed debian/watch

[Emmanuel Bourg]

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

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

commit 5afaeefed7e4661dfef4dc10c4e4a7468a7086da
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Nov 2 15:15:37 2015 +0100

    Fixed debian/watch
---
 debian/changelog   | 1 +
 debian/orig-tar.sh | 4 ++--
 debian/watch       | 3 +--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8328f9e..bb095a9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ sisu-ioc (2.3.0-6) UNRELEASED; urgency=medium
   * Removed the unused build dependencies on the *-java-doc packages
   * Removed the unused debian/libsisu-ioc-java-doc.* files
   * Updated Standards-Version to 3.9.6 (no changes)
+  * Fixed debian/watch
 
   [ Eugene Zhukov ]
   * Remove DEB_MAVEN_BUILD_TARGET from d/rules
diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh
index 8b691c3..fd97ebf 100755
--- a/debian/orig-tar.sh
+++ b/debian/orig-tar.sh
@@ -4,7 +4,7 @@ VERSION=$2
 TAR=../sisu-ioc_$VERSION.orig.tar.xz
 DIR=sisu-ioc-$VERSION
 
-tar xzf $3
-mv sonatype-sisu-* $DIR
+mkdir $DIR
+tar xzf $3 --strip-components=1 -C $DIR
 XZ_OPT=--best tar cJf $TAR -X debian/orig-tar.exclude $DIR
 rm -rf $DIR
diff --git a/debian/watch b/debian/watch
index e8d7f72..2351b94 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,2 @@
 version=3
-http://githubredir.debian.net/github/sonatype/sisu/sisu-(.*).tar.gz \
- debian debian/orig-tar.sh
\ No newline at end of file
+https://github.com/sonatype/sisu/tags .*/sisu-([\d\.]+).tar.gz debian debian/orig-tar.sh

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