------------------------------------------------------------
revno: 967
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Tue 2008-01-15 18:43:36 +0100
message:
ix USE_SYSTEM_XALAN conditional to not reset USE_SYSTEM_XML_APIS bogusly
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2008-01-15 17:41:31 +0000
+++ b/changelog 2008-01-15 17:43:36 +0000
@@ -37,6 +37,8 @@
- enable the report-builder using the internally-built jars for the etch
backport now that this is possible
- temporarily build the report-builder using the internally-built jars
+ - fix USE_SYSTEM_XALAN conditional to not reset USE_SYSTEM_XML_APIS
+ bogusly
* debian/control.in:
- remove Provides: writer2latex from -writer, bogus (we only provide
libwriter2latex-java at all, and that with an old version). Depend
@@ -58,7 +60,7 @@
- debian/rules:
+ Use java-runtime-depends variable for java dependencies.
- -- Rene Engelhard <[EMAIL PROTECTED]> Tue, 15 Jan 2008 17:33:26 +0100
+ -- Rene Engelhard <[EMAIL PROTECTED]> Tue, 15 Jan 2008 18:42:20 +0100
openoffice.org (1:2.3.1-3) unstable; urgency=low
=== modified file 'rules'
--- a/rules 2008-01-15 17:41:31 +0000
+++ b/rules 2008-01-15 17:43:36 +0000
@@ -536,7 +536,7 @@
BUILD_DEPS += , libxalan2-java (>= 2.6.0-1) [$(OOO_JAVA_ARCHS)]
JAVA_COMMON_JAVA_DEPENDS+= , libxalan2-java (>= 2.6.0-1)
# force using system xml-apis.jar
- SYSTEM_XML_APIS=YES
+ SYSTEM_XML_APIS=y
ifneq "$(ETCH_BACKPORT)" "y"
JAVA_GCJ_DEPENDS += , libxalan2-java-gcj
endif
