[Pkg-mysql-commits] [mariadb-5.5] 08/08: Use name 'mariadbclient' in patch so that it will later unapply cleanly

[Otto Kekäläinen]

This is an automated email from the git hooks/post-receive script.

ottok-guest pushed a commit to branch master
in repository mariadb-5.5.

commit 6926c6545517e57841e9d5443c9d48ea0e56fe90
Author: Otto Kekäläinen <otto.kekalainen at seravo.fi>
Date:   Thu Apr 17 23:07:56 2014 +0300

    Use name 'mariadbclient' in patch so that it will later unapply cleanly
---
 debian/patches/44_scripts__mysql_config__libs.diff | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/patches/44_scripts__mysql_config__libs.diff b/debian/patches/44_scripts__mysql_config__libs.diff
index cfa1f2c..549e9a6 100755
--- a/debian/patches/44_scripts__mysql_config__libs.diff
+++ b/debian/patches/44_scripts__mysql_config__libs.diff
@@ -7,11 +7,11 @@
  # Create options 
  # We intentionally add a space to the beginning and end of lib strings, simplifies replace later
 -libs=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqlclient @ZLIB_DEPS@ @NON_THREADED_LIBS@"
-+libs=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqlclient"
++libs=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmariadbclient"
  libs="$libs @openssl_libs@ @STATIC_NSS_FLAGS@ "
 -libs_r=" $ldflags -L$pkglibdir  @RPATH_OPTION@ -lmysqlclient_r @ZLIB_DEPS@ @CLIENT_LIBS@ @openssl_libs@ "
 -embedded_libs=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqld @LIBDL@ @ZLIB_DEPS@ @LIBS@ @WRAPLIBS@ @openssl_libs@ "
-+libs_r=" $ldflags -L$pkglibdir  @RPATH_OPTION@ -lmysqlclient_r @CLIENT_LIBS@ @openssl_libs@ "
++libs_r=" $ldflags -L$pkglibdir  @RPATH_OPTION@ -lmariadbclient_r @CLIENT_LIBS@ @openssl_libs@ "
 +embedded_libs=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqld @LIBDL@ @WRAPLIBS@ @openssl_libs@ "
  
  if [ -r "$pkglibdir/libmygcc.a" ]; then

-- 
Alioth's hooks/post-receive on /srv/git.debian.org/git/pkg-mysql/mariadb-5.5.git