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

[twerner at alioth.debian.org]

Author: twerner
Date: 2008-11-07 21:31:02 +0000 (Fri, 07 Nov 2008)
New Revision: 7246

Modified:
   trunk/glassfish/debian/changelog
   trunk/glassfish/debian/control
Log:
merge changes from Lenny:
* Fix java runtime Depends. (Closes: #503775)

Modified: trunk/glassfish/debian/changelog
===================================================================
--- trunk/glassfish/debian/changelog	2008-11-07 21:23:11 UTC (rev 7245)
+++ trunk/glassfish/debian/changelog	2008-11-07 21:31:02 UTC (rev 7246)
@@ -1,3 +1,10 @@
+glassfish (1:2ur2-b04-2) unstable; urgency=low
+
+  merge changes from Lenny:
+  * Fix java runtime Depends. (Closes: #503775)
+
+ -- Torsten Werner <twerner at debian.org>  Thu, 06 Nov 2008 22:00:12 +0100
+
 glassfish (1:2ur2-b04-1) unstable; urgency=low
 
   * new upstream release

Modified: trunk/glassfish/debian/control
===================================================================
--- trunk/glassfish/debian/control	2008-11-07 21:23:11 UTC (rev 7245)
+++ trunk/glassfish/debian/control	2008-11-07 21:31:02 UTC (rev 7246)
@@ -21,7 +21,7 @@
 
 Package: glassfish-activation
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, java-gcj-compat | java1-runtime | java2-runtime
+Depends: ${shlibs:Depends}, ${misc:Depends}, java-gcj-compat | java2-runtime
 Description: Open source Java EE 5 Application Server
  The GlassFish community is building free, open source,
  production-quality, enterprise software. The main deliverables are an
@@ -32,7 +32,7 @@
 
 Package: glassfish-appserv
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, java-gcj-compat | java1-runtime | java2-runtime
+Depends: ${shlibs:Depends}, ${misc:Depends}, openjdk-6-jre | java6-runtime
 Description: Open source Java EE 5 Application Server
  The GlassFish community is building free, open source,
  production-quality, enterprise software. The main deliverables are an
@@ -43,7 +43,7 @@
 
 Package: glassfish-jmac-api
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, java-gcj-compat | java1-runtime | java2-runtime
+Depends: ${shlibs:Depends}, ${misc:Depends}, openjdk-6-jre | java6-runtime
 Description: Open source Java EE 5 Application Server
  The GlassFish community is building free, open source,
  production-quality, enterprise software. The main deliverables are an
@@ -54,7 +54,7 @@
 
 Package: glassfish-mail
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, java-gcj-compat | java1-runtime | java2-runtime
+Depends: ${shlibs:Depends}, ${misc:Depends}, java-gcj-compat | java2-runtime
 Description: Open source Java EE 5 Application Server
  The GlassFish community is building free, open source,
  production-quality, enterprise software. The main deliverables are an
@@ -65,7 +65,7 @@
 
 Package: glassfish-javaee
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, java-gcj-compat | java1-runtime | java2-runtime
+Depends: ${shlibs:Depends}, ${misc:Depends}, openjdk-6-jre | java6-runtime
 Description: Open source Java EE 5 Application Server
  The GlassFish community is building free, open source,
  production-quality, enterprise software. The main deliverables are an
@@ -77,7 +77,7 @@
 
 Package: glassfish-toplink-essentials
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, java-gcj-compat | java1-runtime | java2-runtime
+Depends: ${shlibs:Depends}, ${misc:Depends}, openjdk-6-jre | java6-runtime
 Description: Open source Java EE 5 Application Server
  The GlassFish community is building free, open source,
  production-quality, enterprise software. The main deliverables are an