[glassfish] 30/40: UNRELEASED * New upstream release * Update debian/watch for release 2.1.1.

[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 56f432d1de09494c5026b3e1ef2299f865ecd60f
Author: Torsten Werner <twerner at debian.org>
Date:   Sun May 16 22:07:16 2010 +0000

    UNRELEASED
    * New upstream release
    * Update debian/watch for release 2.1.1.
---
 debian/changelog | 8 ++++++++
 debian/rules     | 2 +-
 debian/watch     | 6 +++++-
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c15476b..37ab5d4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+glassfish (1:2.1.1-b31-1) unstable; urgency=low
+
+  UNRELEASED
+  * New upstream release
+  * Update debian/watch for release 2.1.1.
+
+ -- Torsten Werner <twerner at debian.org>  Mon, 17 May 2010 00:01:28 +0200
+
 glassfish (1:2ur2-b04-6) unstable; urgency=low
 
   * Increase sleep time to 20 seconds. (Closes: #574307)
diff --git a/debian/rules b/debian/rules
index 71c8826..2a29e83 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,4 +25,4 @@ common-install-prehook-indep::
 	done
 
 get-orig-source:
-	-uscan --upstream-version 0
+	uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download
diff --git a/debian/watch b/debian/watch
index 6c6a4cd..a590444 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,7 @@
 version=3
-http://download.java.net/javaee5/v(2[[:digit:].]+)/promoted/source/glassfish-v([[:alnum:].-]+)-src.zip \
+
+# after 2.1.2 gets available:
+#http://download.java.net/javaee5/v(2[[:digit:].]+)/promoted/source/glassfish-v([[:alnum:].-]+)-src.zip \
+
+http://download.java.net/javaee5/v2.1.1/promoted/source/glassfish-v([[:alnum:].-]+)-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