------------------------------------------------------------
revno: 1772
committer: Rene Engelhard <r...@debian.org>
branch nick: unstable
timestamp: Tue 2009-12-08 09:06:15 +0100
message:
update ooo-build; use internal mysqlcppconn on i386
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2009-12-07 01:25:43 +0000
+++ b/changelog 2009-12-08 08:06:15 +0000
@@ -1,20 +1,25 @@
openoffice.org (1:3.1.1-9) UNRELEASED; urgency=low
* ooo-build
- - update (20a977a82047c1627483c9e86dbd128f656173b6)
+ - update (6d633a2390f016eeaaa2a6a58cde1bad0a7d44e4)
- cws-linuxhppa1.diff: backport hppa port (closes: #484116)
- open-url-support-iceanimals.diff: support ice{ape,dove,weasel}
in open-url (closes: #543652)
+ - add support for building with internal mysql-connector-cpp (as
+ upstream does) to ooo-build infrastructure; disable
+ debian-mysqlc-build-against-stlport-hack.diff for now
* debian/rules:
- re-enable sparc
- fix install on no-Java builds
- add BUILD_HPPA conditional, don't enable it yet
- build-depend on libmysqlcppconn*-dev (>= 1.1.0~r791) to build against
- version with fixed visibility of (e.g.) SQLException (closes: #558240)
+ version with fixed visibility of (e.g.) SQLException
+ This closes: #558240 for !i386 at least.
+ Build with internal libmysqlcppconn on i386 for now...
* debian/scripts/vars.hppa: add
- -- Rene Engelhard <r...@debian.org> Mon, 07 Dec 2009 01:54:24 +0100
+ -- Rene Engelhard <r...@debian.org> Tue, 08 Dec 2009 09:03:26 +0100
openoffice.org (1:3.1.1-8) unstable; urgency=low
=== modified file 'rules'
--- a/rules 2009-12-02 21:06:20 +0000
+++ b/rules 2009-12-08 08:06:15 +0000
@@ -348,6 +348,7 @@
endif
ifeq ($(ARCH),$(findstring $(ARCH),$(OOO_STLPORT_ARCHS)))
USE_SYSTEM_GRAPHITE=n
+ USE_SYSTEM_MYSQLCPPCONN=n
endif
ifeq "$(ENABLE_OPENGL)" "y"
