./packages/openofficeorg/2.4/experimental r1048: Use openjdk-6-jre instead of icedtea-java7-jre (from Ubuntu)
------------------------------------------------------------
revno: 1048
committer: Rene Engelhard <rene@debian.org>
branch nick: unstable
timestamp: Wed 2008-04-02 14:17:19 +0200
message:
Use openjdk-6-jre instead of icedtea-java7-jre (from Ubuntu)
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2008-04-02 12:09:26 +0000
+++ b/changelog 2008-04-02 12:17:19 +0000
@@ -7,6 +7,8 @@
* merge from Ubuntu:
- debian/*.mime:
+ Update and sort mime-types.
+ - debian/rules:
+ + Use openjdk-6-jre instead of icedtea-java7-jre.
-- Rene Engelhard <rene@debian.org> Fri, 28 Mar 2008 10:53:56 +0100
=== modified file 'rules'
--- a/rules 2008-04-02 12:09:26 +0000
+++ b/rules 2008-04-02 12:17:19 +0000
@@ -546,7 +546,7 @@
# JAVA_RUNTIME_DEPENDS += | $(GCJ_JAWT_DEPENDS)
# endif
ifneq (,$(filter $(ARCH), amd64 i386 powerpc))
- JAVA_RUNTIME_DEPENDS += | icedtea-java7-jre
+ JAVA_RUNTIME_DEPENDS += | openjdk-6-jre
endif
ifneq (,$(filter $(ARCH), amd64 i386))
JAVA_RUNTIME_DEPENDS += | sun-java5-jre | sun-java6-jre
Reply to: