[glassfish] 18/40: * Add a <sleep/> in debian/build.xml because of a strange race condition. * Bump up Standards-Version: 3.8.0 (no changes needed).

[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 2327596944916a855d6c20579d62bafd685d683f
Author: Torsten Werner <twerner at debian.org>
Date:   Mon Aug 11 22:36:16 2008 +0000

    * Add a <sleep/> in debian/build.xml because of a strange race condition.
    * Bump up Standards-Version: 3.8.0 (no changes needed).
---
 debian/build.xml | 1 +
 debian/changelog | 4 +++-
 debian/control   | 4 ++--
 debian/rules     | 2 +-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/debian/build.xml b/debian/build.xml
index 07e1fc1..319ceb2 100644
--- a/debian/build.xml
+++ b/debian/build.xml
@@ -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"/>
diff --git a/debian/changelog b/debian/changelog
index 9ae1ea7..5261867 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,10 @@ glassfish (2+b58g-4) UNRELEASED; urgency=low
 
   * 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
 
diff --git a/debian/control b/debian/control
index 17222bc..c256011 100644
--- a/debian/control
+++ b/debian/control
@@ -4,8 +4,8 @@ Priority: optional
 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
diff --git a/debian/rules b/debian/rules
index 054f96f..54e0a2a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,7 @@ include /usr/share/cdbs/1/class/ant.mk
 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

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