[glassfish] 17/40: * Switch to openjdk-6. * Move package to main.

[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 f9673dfca6cb733c46591616fde635cc783b30c8
Author: Torsten Werner <twerner at debian.org>
Date:   Thu Apr 3 09:56:04 2008 +0000

    * Switch to openjdk-6.
    * Move package to main.
---
 debian/changelog | 7 +++++++
 debian/control   | 4 ++--
 debian/rules     | 2 +-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ac51dec..9ae1ea7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+glassfish (2+b58g-4) UNRELEASED; urgency=low
+
+  * Switch to openjdk-6.
+  * Move package to main.
+
+ -- Torsten Werner <twerner at debian.org>  Thu, 03 Apr 2008 11:36:52 +0200
+
 glassfish (2+b58g-3) unstable; urgency=low
 
   * Build directory servlet-api to make javaee more complete.
diff --git a/debian/control b/debian/control
index 668b3b4..17222bc 100644
--- a/debian/control
+++ b/debian/control
@@ -1,10 +1,10 @@
 Source: glassfish
-Section: contrib/libs
+Section: libs
 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, sun-java6-jdk, libaxis-java
+Build-Depends-Indep: ant, openjdk-6-jdk | sun-java6-jdk, libaxis-java
 Standards-Version: 3.7.3
 Homepage: https://glassfish.dev.java.net/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/glassfish
diff --git a/debian/rules b/debian/rules
index 3242e8d..054f96f 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 		:= /usr/lib/jvm/java-6-sun
+JAVA_HOME_DIRS          := /usr/lib/jvm/java-6-openjdk /usr/lib/jvm/java-6-sun
 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