[ooo-build-commit] Branch 'ooo-build-3-1-1' - 2 commits - patches/dev300

[René Engelhard]

 patches/dev300/apply                                         |    2 +-
 patches/dev300/debian-mysqlc-build-against-stlport-hack.diff |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 2b2b3d729a703530b6fb6a2bb24c13844bd5efd3
Author: Rene Engelhard <rene at debian.org>
Date:   Wed Sep 16 16:00:35 2009 +0200

    adapt debian-mysqlc-build-against-stlport-hack.diff

diff --git a/patches/dev300/debian-mysqlc-build-against-stlport-hack.diff b/patches/dev300/debian-mysqlc-build-against-stlport-hack.diff
index 2cd5297..54d9453 100644
--- a/patches/dev300/debian-mysqlc-build-against-stlport-hack.diff
+++ b/patches/dev300/debian-mysqlc-build-against-stlport-hack.diff
@@ -13,9 +13,9 @@ Index: mysqlc/source/makefile.mk
 +.ENDIF
  .ELSE
 +.IF "$(USE_SYSTEM_STL)" != "YES"
-+CDEFS += -DCPPCONN_LIB=\"libmysqlcppconn-stlport.so.3\"
++CDEFS += -DCPPCONN_LIB=\"$(shell readlink /usr/lib/libmysqlcppconn-stlport.so)\"
 +.ELSE
- CDEFS += -DCPPCONN_LIB=\"libmysqlcppconn.so.3\"
+ CDEFS += -DCPPCONN_LIB=\"$(shell readlink /usr/lib/libmysqlcppconn.so)\"
  .ENDIF
 +.ENDIF
  
commit 40c00342e603e79a16008d836706f83548023073
Author: Rene Engelhard <rene at debian.org>
Date:   Wed Sep 16 15:57:46 2009 +0200

    fix typo

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 1bb4d1e..7fa84c7 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3409,7 +3409,7 @@ drawinglayer-textbounds-fix.diff, n#523603, thorsten
 dtrans-aqua-dragrect-fix.diff, i#104390, thorsten
 
 [ MySQL ]
-cws-mysqlnative-200900916.diff
+cws-mysqlnative-20090916.diff
 
 [ MySQL and DebianBaseOnly ]
 # add hack to link against STLport version of libmysqlcppconn on i386.