------------------------------------------------------------
revno: 1638
committer: Rene Engelhard <r...@debian.org>
branch nick: 3.2
timestamp: Tue 2009-08-25 16:19:00 +0200
message:
prepare for m56 -- graphite support included there
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2009-08-16 23:29:00 +0000
+++ b/changelog 2009-08-25 14:19:00 +0000
@@ -1,6 +1,6 @@
-openoffice.org (1:3.2.0~dev300m54-1) UNRELEASED; urgency=low
+openoffice.org (1:3.2.0~dev300m56-1) UNRELEASED; urgency=low
- * OpenOffice.org 3.2.0 development milestone 54 (DEV300_m54)
+ * OpenOffice.org 3.2.0 development milestone 56 (DEV300_m56)
- paste into memo field doesn't replace existing content anymore
(closes: #482473)
- has many performance improvements for Base (closes: #488202)
@@ -17,6 +17,8 @@
- revert back to internal redland
- build with --enable-hids to get a hid.lst build we can use later
for the testtool
+ - enable graphite; it's now upstream; don't use system-graphite on i386
+ for now
* debian/control.mediawiki.in:
- we don't need a strict depends on lucene anymore, remove it again
=== modified file 'rules'
--- a/rules 2009-08-16 23:29:00 +0000
+++ b/rules 2009-08-25 14:19:00 +0000
@@ -224,8 +224,12 @@
# "new" source split? This is to be n when to use
# Suns tarballs.
WITH_SPLIT=y
-ENABLE_GRAPHITE=n
-USE_SYSTEM_GRAPHITE=y
+ENABLE_GRAPHITE=y
+ifeq "$(USE_STLPORT)" "y"
+ USE_SYSTEM_GRAPHITE=n
+else
+ USE_SYSTEM_GRAPHITE=y
+endif
ALLOC=system
# when we have a package we want to have to be installed on older things with
some older
@@ -472,13 +476,14 @@
endif
ifeq "$(ENABLE_GRAPHITE)" "y"
- CONFIGURE_FLAGS += --enable-graphite
ifeq "$(USE_SYSTEM_GRAPHITE)" "y"
# No idea whether we actually need the versioned build-dep - but
# go sure
BUILD_DEPS += , libgraphite-dev (>= 1:2.3.1) [$(filter-out
$(OOO_STLPORT_ARCHS),$(OOO_ARCHS))]
CONFIGURE_FLAGS += --with-system-graphite
endif
+else
+ CONFIGURE_FLAGS += --disable-graphite
endif
ifeq "$(USE_LIBCURL4)" "y"
