------------------------------------------------------------
revno: 1214
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Mon 2008-11-17 22:31:12 +0100
message:
don't add | java2-runtime to JAVA_RUNTIME_DEPENDS as we don't work with
cacao-oj6
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2008-11-17 20:53:58 +0000
+++ b/changelog 2008-11-17 21:31:12 +0000
@@ -2,8 +2,11 @@
* debian/control.postgresql.in:
- only suggest postgresql
+ * debian/rules:
+ - don't add | java2-runtime to JAVA_RUNTIME_DEPENDS as we don't work
+ with cacao-oj6
- -- Rene Engelhard <[EMAIL PROTECTED]> Mon, 17 Nov 2008 21:25:06 +0100
+ -- Rene Engelhard <[EMAIL PROTECTED]> Mon, 17 Nov 2008 22:29:40 +0100
openoffice.org (1:2.4.1-12) unstable; urgency=high
=== modified file 'rules'
--- a/rules 2008-10-28 22:48:39 +0000
+++ b/rules 2008-11-17 21:31:12 +0000
@@ -527,7 +527,6 @@
ifneq (,$(filter $(ARCH), amd64 i386))
JAVA_RUNTIME_DEPENDS += | sun-java5-jre | sun-java6-jre
endif
- JAVA_RUNTIME_DEPENDS += | java2-runtime
GCJ_JAWT_DIR=$(shell dirname `dpkg -L $(GCJ_JAWT_DEPENDS) | grep
libjawt.so`)
export JAVA_HOME
CONFIGURE_FLAGS += --with-jdk-home=$(JAVA_HOME)
