./packages/openofficeorg/3.2.1/unstable r2033: fix builds without Java
------------------------------------------------------------
revno: 2033
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Mon 2010-06-21 01:55:51 +0200
message:
fix builds without Java
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2010-06-19 13:01:04 +0000
+++ b/changelog 2010-06-20 23:55:51 +0000
@@ -1,3 +1,10 @@
+openoffice.org (1:3.2.1-4) UNRELEASED; urgency=low
+
+ * debian/rules:
+ - fix builds without Java
+
+ -- Rene Engelhard <rene@debian.org> Mon, 21 Jun 2010 01:09:58 +0200
+
openoffice.org (1:3.2.1-3) unstable; urgency=low
* ooo-build:
=== modified file 'rules'
--- a/rules 2010-06-16 20:17:41 +0000
+++ b/rules 2010-06-20 23:55:51 +0000
@@ -873,6 +873,7 @@
export JAVA_HOME
CONFIGURE_FLAGS += --with-jdk-home=$(JAVA_HOME)
JAVA_COMMON_DEPENDS= , openoffice.org$(VER)-java-common
+ JAVA_COMMON_DEPENDS_VERSION:= (>= $(BASE_VERSION)~)
ifeq "$(USE_SYSTEM_SAXON)" "y"
CONFIGURE_FLAGS += --with-system-saxon --with-saxon-jar=/usr/share/java/saxonb.jar
BUILD_DEPS += , libsaxonb-java [$(OOO_JAVA_ARCHS)]
@@ -3658,7 +3659,7 @@
-V'help-l10n-virtual-version=$(HELP_L10N_VIRTUAL_VERSION)' \
-V'dev-stl-depends=$(DEV_STL_DEPENDS)' \
-V'base-hsqldb-depends=$(BASE_HSQLDB_DEPENDS)' \
- -V'java-common-depends=$(JAVA_COMMON_DEPENDS) (>= $(BASE_VERSION)~)' \
+ -V'java-common-depends=$(JAVA_COMMON_DEPENDS) $(JAVA_COMMON_DEPENDS_VERSION)' \
-V'java-runtime-depends=$(JAVA_RUNTIME_DEPENDS)' \
-V'java-gcj-depends=$(JAVA_GCJ_DEPENDS)' \
-V'mozilla-nss-depends=$(MOZILLA_NSS_DEPENDS)' \
Reply to: