./packages/openofficeorg/3.2/experimental r1742: update ooo-build; use ooo-build tarballs for now, we get a rc2 anyway. Split changelog
------------------------------------------------------------
revno: 1742
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Fri 2009-12-18 02:00:59 +0100
message:
update ooo-build; use ooo-build tarballs for now, we get a rc2 anyway. Split changelog
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2009-12-16 01:25:01 +0000
+++ b/changelog 2009-12-18 01:00:59 +0000
@@ -3,24 +3,33 @@
* OpenOffice.org 3.2.0 release candidate 1 (OOO320_m8)
* ooo-build
- - update (f6b210783462c203eed15f254c84df85cf931682)
+ - update (663472a5cf4c5c859ca4affb625ed688f4b01456)
- makes "Always allow saving of document" configurable (closes: #478130)
- src: add OOO320 GSIs from ftp.linux.cz
- - debian-opt.diff: build with -O2 instead of -Os. Fixes FTBFS on ppc
* debian/rules:
- re-enable eo
- enable hppa, use gcj-jdk
+ - --enable-layout
+
+ * merge 1:3.1.1-9 to 1:3.1.1-11
+
+ -- Rene Engelhard <rene@debian.org> Fri, 18 Dec 2009 01:55:27 +0100
+
+openoffice.org (1:3.1.1-11) UNRELEASED; urgency=low
+
+ * ooo-build:
+ - update (9abd31dafcdca7bf73d84ae148fd2700bfb0726f)
+ - debian-opt.diff: build with -O2 instead of -Os. Fixes FTBFS on ppc
+
* debian/control.in:
- bump ttf-opensymbol dep to (>= 1:3.0), we need it for some bullets
- (closes: #561182)
+ (closes: #561182)
* debian/rules:
- build-depend on g++-4.4 (>= 4.4.2-5) on armel because of various
- wrong code generation fixes. Thanks Matthias Klose.
+ wrong code generation fixes. Thanks Matthias Klose.
- bump build-dep for mono to >= 2.4.2.3 and adapt for csc -> mono-csc
- change
-
- * merge 1:3.1.1-9 and 1:3.1.1-10
+ change
-- Rene Engelhard <rene@debian.org> Wed, 16 Dec 2009 02:20:30 +0100
=== modified file 'rules'
--- a/rules 2009-12-16 01:25:01 +0000
+++ b/rules 2009-12-18 01:00:59 +0000
@@ -234,13 +234,13 @@
# broken!
ENABLE_GIO=n
ENABLE_RANDR=y
-ENABLE_LAYOUT=n
+ENABLE_LAYOUT=y
ifeq "$(BUILD_GTK)" "y"
PACKAGE_NPSOPLUGIN=y
endif
# "new" source split? This is to be n when to use
# Suns tarballs.
-WITH_SPLIT=n
+WITH_SPLIT=y
ENABLE_GRAPHITE=y
ifeq "$(USE_STLPORT)" "y"
USE_SYSTEM_GRAPHITE=n
Reply to: