------------------------------------------------------------
revno: 992
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Tue 2008-01-15 18:50:06 +0100
message:
merge xml-apis fix from 2.4
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2008-01-15 17:45:02 +0000
+++ b/changelog 2008-01-15 17:50:06 +0000
@@ -7,12 +7,15 @@
like Albany MT/Tahoma MT
* debian/openoffice.org-base-core.overrides.lintian:
- override RPATH warning
+ * debian/rules:
+ - fix SYSTEM_XALAN conditional to not reset SYSTEM_XML_APIS
+ bogusly
* merge from Ubuntu:
- debian/rules:
+ make -gcj depend on libhsqldb-java-gcj
+ some minor parallel build conditional improvements
- -- Rene Engelhard <[EMAIL PROTECTED]> Fri, 11 Jan 2008 15:39:33 +0100
+ -- Rene Engelhard <[EMAIL PROTECTED]> Tue, 15 Jan 2008 18:49:19 +0100
openoffice.org (1:2.3.1-3) unstable; urgency=low
=== modified file 'rules'
--- a/rules 2008-01-06 18:11:02 +0000
+++ b/rules 2008-01-15 17:50:06 +0000
@@ -458,7 +458,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
