------------------------------------------------------------
revno: 1464
committer: Rene Engelhard <r...@debian.org>
branch nick: experimental
timestamp: Mon 2009-03-23 23:10:32 +0100
message:
merge
modified:
changelog
rules
------------------------------------------------------------
revno: 1332.1.108
committer: Rene Engelhard <r...@debian.org>
branch nick: unstable
timestamp: Mon 2009-03-23 16:04:57 +0100
message:
ooo-build-3-0-1 also should be only done in git...
modified:
changelog
control.in
rules
------------------------------------------------------------
revno: 1332.1.109
committer: Rene Engelhard <r...@debian.org>
branch nick: unstable
timestamp: Mon 2009-03-23 22:13:47 +0100
message:
regenerate control
modified:
changelog
control
------------------------------------------------------------
revno: 1332.1.110
committer: Rene Engelhard <r...@debian.org>
branch nick: unstable
timestamp: Mon 2009-03-23 23:06:11 +0100
message:
use java-gcj-compat for mips*
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2009-03-23 21:06:36 +0000
+++ b/changelog 2009-03-23 22:10:32 +0000
@@ -4,7 +4,7 @@
[ Rene Engelhard ]
* ooo-build:
- - update (c1b4e31fe3b9fddf28d8ed136863e3e9da26a937), now in git
+ - update (464d9032f7020e06fc987908a7cb7c76b9c7a69e), now in git
*without* ChangeLog...
* debian/rules:
- fix saxon conditional. use internal saxon because system-saxon
@@ -13,6 +13,9 @@
otherwise because iceape-dev is not installed.
- remove "openoffice" symlink, add "openoffice.org$(VER)" (closes:
#511232),
upstream has openoffice.org3 launcher in /usr/bin, too
+ - build with java-gcj-compat on mipsel (and mips, too as IMHO it doesn't
+ make sense to build mips and mipsel with different JDKs) so that it
+ builds...
* debian/rules, debian/control.qa.in, debian/openoffice.org-qa-tools-*:
- remove -qa-*, broken and unused anyway
@@ -29,7 +32,7 @@
revision.
(Closes: Bug#520604)
- -- Rene Engelhard <r...@debian.org> Mon, 23 Mar 2009 01:08:20 +0100
+ -- Rene Engelhard <r...@debian.org> Mon, 23 Mar 2009 23:09:49 +0100
openoffice.org (1:3.1.0~ooo310m6-1) experimental; urgency=low
=== modified file 'rules'
--- a/rules 2009-03-23 12:20:11 +0000
+++ b/rules 2009-03-23 22:10:32 +0000
@@ -103,6 +103,9 @@
ifeq "$(ARCH)" "ia64"
JDK=java-gcj-compat
endif
+ifneq (,$(findstring mips,$(ARCH)))
+ JDK=java-gcj-compat
+endif
ENABLE_MONO=y
MONO2=y
ifeq "$(MONO2)" "y"
