------------------------------------------------------------
revno: 1000
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Wed 2008-02-13 23:05:36 +0100
message:
make arm really use --without-java, update ooo-build
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2008-02-13 14:12:57 +0000
+++ b/changelog 2008-02-13 22:05:36 +0000
@@ -1,12 +1,15 @@
openoffice.org (1:2.4.0~rc1-1.2pre) experimental; urgency=low
+ * ooo-build:
+ - update (r11567)
* debian/rules:
- build-depend on debhelper >= 5.0.51~ for dh_icons, thanks lintian
+ - make arm build really use --without-java for the build
* debian/libuno-cil.installcligac.in:
- also register cli_uno_bridge.dll (although versioned 0.0.0.0) into the
GAC
- -- Rene Engelhard <[EMAIL PROTECTED]> Wed, 13 Feb 2008 15:08:19 +0100
+ -- Rene Engelhard <[EMAIL PROTECTED]> Wed, 13 Feb 2008 23:03:15 +0100
openoffice.org (1:2.4.0~rc1-1) experimental; urgency=low
=== modified file 'rules'
--- a/rules 2008-02-13 12:56:20 +0000
+++ b/rules 2008-02-13 22:05:36 +0000
@@ -275,6 +275,11 @@
endif
ifeq (,$(findstring $(ARCH),$(OOO_JAVA_ARCHS)))
ENABLE_JAVA=n
+else
+ # extra step needed for arm, as the if matches the arm in armel..
+ ifeq "$(ARCH)" "arm"
+ ENABLE_JAVA=n
+ endif
endif
# mono
# ppc fails (#412967)
