[glassfish] 07/40: * Fix watch file and orig-tar.sh

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to annotated tag debian/1%3A2.1.1-b31-1
in repository glassfish.

commit 263002c871777f4ec19a7aa35afff406a5f29da2
Author: Varun Hiremath <varun at debian.org>
Date:   Mon Oct 29 18:03:19 2007 +0000

    * Fix watch file and orig-tar.sh
---
 debian/orig-tar.exclude | 4 ++++
 debian/orig-tar.sh      | 6 +++---
 debian/watch            | 4 ++--
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/debian/orig-tar.exclude b/debian/orig-tar.exclude
new file mode 100644
index 0000000..de560cc
--- /dev/null
+++ b/debian/orig-tar.exclude
@@ -0,0 +1,4 @@
+*.jar
+*.war
+*.ear
+*.class
diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh
index f4e679e..9ed970e 100755
--- a/debian/orig-tar.sh
+++ b/debian/orig-tar.sh
@@ -1,13 +1,13 @@
 #!/bin/sh -e
 
 # called by uscan with '--upstream-version' <version> <file>
-TAR=glassfish_$2.orig.tar.gz
+TAR=../glassfish_$2.orig.tar.gz
 DIR=glassfish-$2.orig
 
 # clean up the upstream tarball
 unzip $3
-mv glasfish $DIR
-tar -c -z -f $TAR --exclude '*.jar' $DIR
+mv glassfish $DIR
+GZIP=--best tar -c -z -f $TAR -X debian/orig-tar.exclude $DIR
 rm -rf $3 $DIR
 
 # move to directory 'tarballs'
diff --git a/debian/watch b/debian/watch
index 73458d9..c033a21 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
 version=3
-opts="uversionmangle=s/-/+/,uversionmangle=s/^v//,dversionmangle=s/-/+/,dversionmangle=s/^v//" \
-http://download.java.net/javaee5/v2_branch/promoted/source/ glassfish-(.*)-src.zip debian debian/orig-tar.sh
+opts="uversionmangle=s/-/+/,dversionmangle=s/-/+/" \
+http://download.java.net/javaee5/v2_branch/promoted/source/ glassfish-v(.*)-src.zip debian debian/orig-tar.sh

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