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

[twerner at alioth.debian.org]

Author: twerner
Date: 2008-08-11 22:36:16 +0000 (Mon, 11 Aug 2008)
New Revision: 6876

Modified:
   trunk/glassfish/debian/build.xml
   trunk/glassfish/debian/changelog
   trunk/glassfish/debian/control
   trunk/glassfish/debian/rules
Log:
* Add a <sleep/> in debian/build.xml because of a strange race condition.
* Bump up Standards-Version: 3.8.0 (no changes needed).

Modified: trunk/glassfish/debian/build.xml
===================================================================
--- trunk/glassfish/debian/build.xml	2008-08-11 19:13:51 UTC (rev 6875)
+++ trunk/glassfish/debian/build.xml	2008-08-11 22:36:16 UTC (rev 6876)
@@ -58,6 +58,7 @@
     <ant dir="../persistence-api" target="all"/>
     <ant dir="../connector-api" target="all"/>
     <ant dir="../management-api" target="all"/>
+    <sleep milliseconds="200"/>
     <ant dir="../appserv-api" target="all"/>
     <ant dir="../jmac-api" target="all"/>
     <ant dir="../jacc-api" target="all"/>

Modified: trunk/glassfish/debian/changelog
===================================================================
--- trunk/glassfish/debian/changelog	2008-08-11 19:13:51 UTC (rev 6875)
+++ trunk/glassfish/debian/changelog	2008-08-11 22:36:16 UTC (rev 6876)
@@ -2,8 +2,10 @@
 
   * Switch to openjdk-6.
   * Move package to main.
+  * Add a <sleep/> in debian/build.xml because of a strange race condition.
+  * Bump up Standards-Version: 3.8.0 (no changes needed).
 
- -- Torsten Werner <twerner at debian.org>  Thu, 03 Apr 2008 11:36:52 +0200
+ -- Torsten Werner <twerner at debian.org>  Tue, 12 Aug 2008 00:33:06 +0200
 
 glassfish (2+b58g-3) unstable; urgency=low
 

Modified: trunk/glassfish/debian/control
===================================================================
--- trunk/glassfish/debian/control	2008-08-11 19:13:51 UTC (rev 6875)
+++ trunk/glassfish/debian/control	2008-08-11 22:36:16 UTC (rev 6876)
@@ -4,8 +4,8 @@
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Varun Hiremath <varunhiremath at gmail.com>, Torsten Werner <twerner at debian.org>
 Build-Depends: cdbs, debhelper (>= 5), quilt
-Build-Depends-Indep: ant, openjdk-6-jdk | sun-java6-jdk, libaxis-java
-Standards-Version: 3.7.3
+Build-Depends-Indep: ant, openjdk-6-jdk, libaxis-java
+Standards-Version: 3.8.0
 Homepage: https://glassfish.dev.java.net/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/glassfish
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/glassfish

Modified: trunk/glassfish/debian/rules
===================================================================
--- trunk/glassfish/debian/rules	2008-08-11 19:13:51 UTC (rev 6875)
+++ trunk/glassfish/debian/rules	2008-08-11 22:36:16 UTC (rev 6876)
@@ -4,7 +4,7 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
-JAVA_HOME_DIRS          := /usr/lib/jvm/java-6-openjdk /usr/lib/jvm/java-6-sun
+JAVA_HOME               := /usr/lib/jvm/java-6-openjdk
 DEB_ANT_BUILD_TARGET	:= jar
 DEB_ANT_BUILDFILE	:= debian/build.xml
 DEB_DESTDIR		:= $(CURDIR)/debian/tmp