------------------------------------------------------------
revno: 1085
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: unstable
timestamp: Mon 2008-04-28 19:38:09 +0200
message:
+ - explicitely set ENABLE_REPORTDESIGN=n in arch conditonals for
+ disabling java (-> arm(el))
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2008-04-26 23:17:18 +0000
+++ b/changelog 2008-04-28 17:38:09 +0000
@@ -9,6 +9,8 @@
- fix java-gcj-compat-dev build-depends conditional logic to set the
right versioned build-dep for !etch
- correct control.mono.in inclusion regardless of host architecture
+ - explicitely set ENABLE_REPORTDESIGN=n in arch conditonals for
+ disabling java (-> arm(el))
* debian/scripts/vars.ppc64: actually add
-- Rene Engelhard <[EMAIL PROTECTED]> Sun, 27 Apr 2008 00:59:54 +0200
=== modified file 'rules'
--- a/rules 2008-04-26 23:17:18 +0000
+++ b/rules 2008-04-28 17:38:09 +0000
@@ -279,10 +279,12 @@
endif
ifeq (,$(findstring $(ARCH),$(OOO_JAVA_ARCHS)))
ENABLE_JAVA=n
+ ENABLE_REPORTDESIGN=n
else
# extra step needed for arm, as the if matches the arm in armel..
ifeq "$(ARCH)" "arm"
ENABLE_JAVA=n
+ ENABLE_REPORTDESIGN=n
endif
endif
