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

[twerner at alioth.debian.org]

Author: twerner
Date: 2008-04-03 09:56:04 +0000 (Thu, 03 Apr 2008)
New Revision: 6078

Modified:
   trunk/glassfish/debian/changelog
   trunk/glassfish/debian/control
   trunk/glassfish/debian/rules
Log:
* Switch to openjdk-6.
* Move package to main.

Modified: trunk/glassfish/debian/changelog
===================================================================
--- trunk/glassfish/debian/changelog	2008-04-02 23:30:16 UTC (rev 6077)
+++ trunk/glassfish/debian/changelog	2008-04-03 09:56:04 UTC (rev 6078)
@@ -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.

Modified: trunk/glassfish/debian/control
===================================================================
--- trunk/glassfish/debian/control	2008-04-02 23:30:16 UTC (rev 6077)
+++ trunk/glassfish/debian/control	2008-04-03 09:56:04 UTC (rev 6078)
@@ -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

Modified: trunk/glassfish/debian/rules
===================================================================
--- trunk/glassfish/debian/rules	2008-04-02 23:30:16 UTC (rev 6077)
+++ trunk/glassfish/debian/rules	2008-04-03 09:56:04 UTC (rev 6078)
@@ -4,7 +4,7 @@
 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