./packages/openofficeorg/3.0/experimental r1060: merge
------------------------------------------------------------
revno: 1060
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Mon 2008-04-28 19:42:35 +0200
message:
merge
modified:
changelog
rules
------------------------------------------------------------
revno: 1022.1.63
committer: Rene Engelhard <rene@debian.org>
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:18:26 +0000
+++ b/changelog 2008-04-28 17:42:35 +0000
@@ -4,7 +4,7 @@
- Base now doesn't quit anymore on "recently used files" in the wizard
when those got deleted/moved (closes: #452810)
* ooo-build:
- - update (r12336)
+ - update (r12357)
* debian/template.desktop.in: move to ..
* debian/startcenter.desktop.in: .. this and run ooffice now, which
will bring us to the new StartCenter. Reuse writers icon.
@@ -41,7 +41,7 @@
* debian/copyright: LGPL v3
* debian/scripts/vars.*: add PLATFORMID (not kfreebsd-* yet...)
- -- Rene Engelhard <rene@debian.org> Sun, 27 Apr 2008 00:46:02 +0200
+ -- Rene Engelhard <rene@debian.org> Mon, 28 Apr 2008 12:36:13 +0200
openoffice.org (1:2.4.0-5.6pre) unstable; urgency=low
@@ -54,6 +54,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 <rene@debian.org> Sun, 27 Apr 2008 00:59:54 +0200
=== modified file 'rules'
--- a/rules 2008-04-26 23:18:26 +0000
+++ b/rules 2008-04-28 17:42:35 +0000
@@ -226,15 +226,14 @@
USE_SYSTEM_HSQLDB=n
ENABLE_REPORTDESIGN=y
USE_SYSTEM_JFREEREPORT=n
- ENABLE_MEDIAWIKI=y
+ # etchs ant too old
+ ENABLE_MEDIAWIKI=n
NEONSONR=26
NEW_DPKG_SHLIBDEPS=n
DBVER=4.4
USE_SYSTEM_ICU=n
USE_STLPORT=y
PACKAGE_WRITER2LATEX=y
- # etchs ant too old
- ENABLE_MEDIAWIKI=n
endif
#############
@@ -290,10 +289,14 @@
endif
ifeq (,$(findstring $(ARCH),$(OOO_JAVA_ARCHS)))
ENABLE_JAVA=n
+ ENABLE_REPORTDESIGN=n
+ ENABLE_MEDIAWIKI=n
else
# extra step needed for arm, as the if matches the arm in armel..
ifeq "$(ARCH)" "arm"
ENABLE_JAVA=n
+ ENABLE_REPORTDESIGN=n
+ ENABLE_MEDIAWIKI=n
endif
endif
Reply to: