------------------------------------------------------------
revno: 1656
committer: Rene Engelhard <r...@debian.org>
branch nick: experimental
timestamp: Sat 2009-08-29 18:43:14 +0200
message:
update mysql-connector stuff for new extract
modified:
changelog
control.mysql.in
rules
=== modified file 'changelog'
--- a/changelog 2009-08-28 07:07:47 +0000
+++ b/changelog 2009-08-29 16:43:14 +0000
@@ -1,3 +1,14 @@
+openoffice.org (1:3.1.1-2) UNRELEASED; urgency=low
+
+ * ooo-build:
+ - update (9c418d97049f8f3380518cf6cac166d518cae388)
+ * debian/rules:
+ - bump libmysqlcppconn-dev builddep for new snapshot of mysqlnative
+ * debian/control.mysql.in:
+ - remove conflicts against OOo >= 3.3
+
+ -- Rene Engelhard <r...@debian.org> Fri, 28 Aug 2009 09:06:36 +0200
+
openoffice.org (1:3.1.1-1) unstable; urgency=low
* OpenOffice.org 3.1.1 final release.
=== modified file 'control.mysql.in'
--- a/control.mysql.in 2009-08-28 07:03:03 +0000
+++ b/control.mysql.in 2009-08-29 16:43:14 +0000
@@ -5,7 +5,7 @@
Pre-Depends: openoffice.orgVER-common
Depends: ${shlibs:Depends}, openoffice.orgVER-core (>> 1:3.1~)
${misc:Depends}
-Conflicts: openoffice.orgVER-java-common (<< 2.3.0~src680m212),
openoffice.orgVER-gcj (<< 2.3.0~src680m212), openoffice.orgVER-core (>= 1:3.3~)
+Conflicts: openoffice.orgVER-java-common (<< 2.3.0~src680m212),
openoffice.orgVER-gcj (<< 2.3.0~src680m212)
Suggests: mysql-server (>= 5.1)
Description: MySQL Connector extension for OpenOffice.org
OpenOffice.org is a full-featured office productivity suite that provides
=== modified file 'rules'
--- a/rules 2009-08-26 06:18:26 +0000
+++ b/rules 2009-08-29 16:43:14 +0000
@@ -930,7 +930,7 @@
endif
ifeq "$(USE_SYSTEM_MSQLCPPCONN)" "y"
CONFIGURE_FLAGS += --with-system-mysql-cppconn
- BUILD_DEPS += , libmysqlcppconn-dev (>= 1.0.6~) [$(filter-out
$(OOO_STLPORT_ARCHS),$(OOO_ARCHS)))]
+ BUILD_DEPS += , libmysqlcppconn-dev (>= 1.0.6~r768) [$(filter-out
$(OOO_STLPORT_ARCHS),$(OOO_ARCHS)))]
endif
endif
