------------------------------------------------------------
revno: 1785
committer: Rene Engelhard <[email protected]>
branch nick: unstable
timestamp: Sat 2009-12-12 23:48:27 +0100
message:
update ooo-build for mysqlclient SONAME fix and add dep to libmysqlclient16...
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2009-12-12 18:33:46 +0000
+++ b/changelog 2009-12-12 22:48:27 +0000
@@ -1,12 +1,18 @@
openoffice.org (1:3.1.1-10) UNRELEASED; urgency=low
+ * ooo-build:
+ - update (6929a9d4285be22b2e6d682bab6d0c5bca2e8fa5)
+ - mysqlcppconn-mysqlclient-SONAME.diff: use libmysqlcppconn.so.16 instead
+ of libmysqlcppconn.so also in the internal mysqlcppconn copy...
+
* debian/rules:
- only build-depend on (gcc-)mingw32 when we actually enable the SDK
- build-depend on kdelibs5-dev (>= 4:4.3.4) when building against KDE4
- * debian/shlibs.local.in:
- force a kdebase-runtime >= 4:4.3.4 dependency
+ - when building with internal mysqlcppconn, add explicit dep on
+ libmysqlclient. Together with the new patch above this closes: #560788
+ * debian/shlibs.local.in: force a kdebase-runtime >= 4:4.3.4 dependency
- -- Rene Engelhard <[email protected]> Sat, 12 Dec 2009 13:22:46 +0100
+ -- Rene Engelhard <[email protected]> Sat, 12 Dec 2009 23:48:05 +0100
openoffice.org (1:3.1.1-9) unstable; urgency=low
=== modified file 'rules'
--- a/rules 2009-12-12 18:31:37 +0000
+++ b/rules 2009-12-12 22:48:27 +0000
@@ -3253,6 +3253,13 @@
$(SOURCE_TREE)/mysqlc/$(shell . $(SOURCE_TREE)/*.sh;
echo $$OUTPATH$$PROEXT)/lib/mysqlc.uno.so \
$(SOURCE_TREE)/mysqlcppconn/$(shell .
$(SOURCE_TREE)/*.sh; echo $$OUTPATH$$PROEXT)/lib/libmysqlcppconn.so \
> debian/openoffice.org$(VER)-mysql-connector.substvars
+ ifeq "$(USE_SYSTEM_MYSQLCPPCONN)" "n"
+ # add mysqlclient dependency; it apparently is only dlopen()ed in
+ # the internal case.. (And in the external case we have a dep on
+ # libmysqlcppconn4 which deps on libmysqlclient16 already)
+ perl -pi -e 's/(shlibs:Depends=.*$$)/$$1, $(shell cat
/var/lib/dpkg/info/libmysqlclient16.shlibs | grep _r | cut -d" " -f3,4,5)/' \
+ debian/openoffice.org$(VER)-mysql-connector.substvars
+ endif
endif
ifeq "$(ENABLE_MINIMIZER)" "y"
LD_LIBRARY_PATH="/usr/lib/libfakeroot:debian/uno-libs3/$(OOUREDIR)/lib:debian/ure/$(OOUREDIR)/lib:$(PKGDIR)-core/$(OODIR)/program"
\
