------------------------------------------------------------
revno: 1562
committer: Rene Engelhard <r...@debian.org>
branch nick: unstable
timestamp: Fri 2009-05-22 12:25:31 +0200
message:
add | java5-runtime | jre to JAVA_RUNTIME_DEPENDS (closes: #509690)
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2009-05-22 10:18:39 +0000
+++ b/changelog 2009-05-22 10:25:31 +0000
@@ -2,6 +2,7 @@
* debian/rules:
- use gcj-jdk instead of java-gcj-compat-dev (closes: #526292)
+ - add | java5-runtime | jre to JAVA_RUNTIME_DEPENDS (closes: #509690)
* debian/control.in:
- make -evolution depend on libebook-1.2-9 (which is dlopen()ed)
* debian/openoffice.org-common.preinst.in, debian/rules:
=== modified file 'rules'
--- a/rules 2009-05-22 10:18:39 +0000
+++ b/rules 2009-05-22 10:25:31 +0000
@@ -647,6 +647,9 @@
ifneq (,$(filter $(ARCH), amd64 i386))
JAVA_RUNTIME_DEPENDS += | sun-java5-jre | sun-java6-jre
endif
+ JAVA_RUNTIME_DEPENDS += | java5-runtime
+ # Suns Java "packages"
+ JAVA_RUNTIME_DEPENDS += | jre
GCJ_JAWT_DIR=$(shell dirname `dpkg -L $(GCJ_JAWT_DEPENDS) | grep
libjawt.so`)
export JAVA_HOME
CONFIGURE_FLAGS += --with-jdk-home=$(JAVA_HOME)
