------------------------------------------------------------
revno: 1442
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:13:47 +0000
+++ b/changelog 2009-03-23 22:06:11 +0000
@@ -1,4 +1,4 @@
-openoffice.org (1:3.0.1-8) UNRELEASED; urgency=low
+openoffice.org (1:3.0.1-8) UNRELEASED; urgency=high
[ Rene Engelhard ]
* ooo-build:
@@ -11,6 +11,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
@@ -27,7 +30,7 @@
revision.
(Closes: Bug#520604)
- -- Rene Engelhard <r...@debian.org> Mon, 23 Mar 2009 22:08:51 +0100
+ -- Rene Engelhard <r...@debian.org> Mon, 23 Mar 2009 22:58:37 +0100
openoffice.org (1:3.0.1-7) unstable; urgency=high
=== modified file 'rules'
--- a/rules 2009-03-23 15:04:57 +0000
+++ b/rules 2009-03-23 22:06:11 +0000
@@ -98,6 +98,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"
