[glassfish] 22/40: merge changes from Lenny: * Fix java runtime Depends. (Closes: #503775)

[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 653939cd8750c9732ba15d93d26805dc211dfc45
Author: Torsten Werner <twerner at debian.org>
Date:   Fri Nov 7 21:31:02 2008 +0000

    merge changes from Lenny:
    * Fix java runtime Depends. (Closes: #503775)
---
 debian/changelog |  7 +++++++
 debian/control   | 12 ++++++------
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d21828a..9a81a45 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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
diff --git a/debian/control b/debian/control
index c256011..b7ccaa1 100644
--- a/debian/control
+++ b/debian/control
@@ -21,7 +21,7 @@ Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/glassfish
 
 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 @@ Description: Open source Java EE 5 Application Server
 
 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 @@ Description: Open source Java EE 5 Application Server
 
 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 @@ Description: Open source Java EE 5 Application Server
 
 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 @@ Description: Open source Java EE 5 Application Server
 
 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 @@ Description: Open source Java EE 5 Application Server
 
 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

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