./packages/openofficeorg/3.1/experimental r1448: - when enabling the report builder, temporarily build with internal
------------------------------------------------------------
revno: 1448
committer: Rene Engelhard <rene@debian.org>
branch nick: experimental
timestamp: Tue 2009-03-17 10:50:40 +0100
message:
- when enabling the report builder, temporarily build with internal
allocator until issue 100219 is fixed
modified:
changelog
rules
------------------------------------------------------------
revno: 1332.1.99
committer: Rene Engelhard <rene@debian.org>
branch nick: unstable
timestamp: Tue 2009-03-17 10:46:12 +0100
message:
release -6
modified:
changelog
=== modified file 'changelog'
--- a/changelog 2009-03-16 21:27:24 +0000
+++ b/changelog 2009-03-17 09:50:40 +0000
@@ -11,7 +11,7 @@
- new orig without rfc314.txt (closes: #516784)
- removes bogus /rs in some localized dialogs (closes: #514398)
* ooo-build:
- - back on trunk (r15551)
+ - back on trunk (r15555)
- updates openoffice.1 to remove --version (closes: #505768)
- mentions ; vs , change in the help (closes: #519828)
- src: add OOO310 GSIs from ftp.linux.cz
@@ -40,9 +40,11 @@
default anyway and not specifying --with-lang=en-US afais speeds up the
en-US only build even more
- OGLTrans seems to work now in sid (even for amd64), so reenable
- (closes: #517335)
+ (closes: #517335)r
- update pentaho libs (build-)depends to the -OOo31 versions
- enable ca and fi help
+ - when enabling the report builder, temporarily build with internal
+ allocator until issue 100219 is fixed
* debian/control*in:
- update for new sections:
- -dbg -> debug, -l10n-* -> localization, -officebean -> java,
@@ -64,7 +66,7 @@
- update
- migrate to http://wiki.debian.org/Proposals/CopyrightFormat format
- -- Rene Engelhard <rene@debian.org> Mon, 16 Mar 2009 22:25:50 +0100
+ -- Rene Engelhard <rene@debian.org> Tue, 17 Mar 2009 10:49:46 +0100
openoffice.org (1:3.0.1-6) unstable; urgency=low
=== modified file 'rules'
--- a/rules 2009-03-16 23:09:08 +0000
+++ b/rules 2009-03-17 09:50:40 +0000
@@ -220,6 +220,11 @@
WITH_SPLIT=y
ENABLE_GRAPHITE=n
USE_SYSTEM_GRAPHITE=y
+ALLOC=system
+# until issue 100219 is fixed
+ifeq "$(ENABLE_REPORTDESIGN)" "y"
+ ALLOC=internal
+endif
# when we have a package we want to have to be installed on older things with some older
# C++ ABI (like it was the case with openoffice.org2), we need to set this. Don't touch
@@ -263,6 +268,8 @@
# when we don't do that here, too.
CONFIGURE_FLAGS += --disable-access
+CONFIGURE_FLAGS += --with-alloc=$(ALLOC)
+
#############
# Distro-specific overrides
Reply to: