------------------------------------------------------------
revno: 1466
committer: Rene Engelhard <[email protected]>
branch nick: experimental
timestamp: Wed 2009-03-25 20:31:15 +0100
message:
update ooo-build; merge
modified:
changelog
rules
------------------------------------------------------------
revno: 1332.1.111
committer: Rene Engelhard <[email protected]>
branch nick: unstable
timestamp: Wed 2009-03-25 19:50:27 +0100
message:
exclude saxon9 for -gcj. ICEs (killed by OOM?)
modified:
rules
=== modified file 'changelog'
--- a/changelog 2009-03-25 19:17:18 +0000
+++ b/changelog 2009-03-25 19:31:15 +0000
@@ -4,7 +4,7 @@
[ Rene Engelhard ]
* ooo-build:
- - update (d63d165b75c66e6374e2d7d6aae9b6792595d86f), now in git
+ - update (435d707dfd88fef3c395ee4aced50f22feff10ba), now in git
*without* ChangeLog...
* debian/rules:
- fix saxon conditional. use internal saxon because system-saxon
@@ -34,7 +34,7 @@
+ Re-work each package synopsis to avoid self-reference.
(Closes: Bug#520611)
- -- Rene Engelhard <[email protected]> Tue, 24 Mar 2009 23:01:33 +0100
+ -- Rene Engelhard <[email protected]> Wed, 25 Mar 2009 20:30:06 +0100
openoffice.org (1:3.1.0~ooo310m6-1) experimental; urgency=low
=== modified file 'rules'
--- a/rules 2009-03-25 19:17:18 +0000
+++ b/rules 2009-03-25 19:31:15 +0000
@@ -1906,6 +1906,9 @@
debian/tmp/native-jars/
: # remove problematic ones
rm -f debian/tmp/native-jars/ridl.jar
+ifneq "$(USE_SYSTEM_SAXON)" "y"
+ rm -f debian/tmp/native-jars/saxon9.jar
+endif
: # compile the others
# the Debian i386 buildd, although having much ram still OOMs without
# this (at unoil.jar).
