[pkg-java] r12438 - trunk/glassfish/debian

[Torsten Werner]

Author: twerner
Date: 2010-05-16 22:07:16 +0000 (Sun, 16 May 2010)
New Revision: 12438

Modified:
   trunk/glassfish/debian/changelog
   trunk/glassfish/debian/rules
   trunk/glassfish/debian/watch
Log:
UNRELEASED
* New upstream release
* Update debian/watch for release 2.1.1.

Modified: trunk/glassfish/debian/changelog
===================================================================
--- trunk/glassfish/debian/changelog	2010-05-16 15:23:33 UTC (rev 12437)
+++ trunk/glassfish/debian/changelog	2010-05-16 22:07:16 UTC (rev 12438)
@@ -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)

Modified: trunk/glassfish/debian/rules
===================================================================
--- trunk/glassfish/debian/rules	2010-05-16 15:23:33 UTC (rev 12437)
+++ trunk/glassfish/debian/rules	2010-05-16 22:07:16 UTC (rev 12438)
@@ -25,4 +25,4 @@
 	done
 
 get-orig-source:
-	-uscan --upstream-version 0
+	uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download

Modified: trunk/glassfish/debian/watch
===================================================================
--- trunk/glassfish/debian/watch	2010-05-16 15:23:33 UTC (rev 12437)
+++ trunk/glassfish/debian/watch	2010-05-16 22:07:16 UTC (rev 12438)
@@ -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