[SCM] Amarok packaging branch, master, updated. debian/2.4.3-1-11-g0805c91

[Modestas Vainius]

The following commit has been merged in the master branch:
commit 89058fd9e253f774b4676676339e8e767a8bf001
Author: Modestas Vainius <modax at debian.org>
Date:   Sat Dec 17 20:28:01 2011 +0200

    Fix MySQL detection at cmake stage.
    
    (debian_find_mysql_fix.diff patch)
---
 debian/changelog                          |    1 +
 debian/patches/debian_find_mysql_fix.diff |   38 +++++++++++++++++++++++++++++
 debian/patches/series                     |    1 +
 3 files changed, 40 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3025dee..5627347 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ amarok (2.5.0-0r1) UNRELEASED; urgency=low
   * This version of amarok requires kdelibs 4.6, bump build dependency.
   * Bump compat to 9 in order to get automatic build flags handling.
   * Ship Russian documentation translations.
+  * Add debian_find_mysql_fix.diff patch to fix MySQL detection at cmake stage.
 
  -- Modestas Vainius <modax at debian.org>  Sat, 17 Dec 2011 12:08:05 +0200
 
diff --git a/debian/patches/debian_find_mysql_fix.diff b/debian/patches/debian_find_mysql_fix.diff
new file mode 100644
index 0000000..37651d8
--- /dev/null
+++ b/debian/patches/debian_find_mysql_fix.diff
@@ -0,0 +1,38 @@
+From: Modestas Vainius <modax at debian.org>
+Subject: Fix mysql_config call for Debian MySQL
+
+-- Found MySQL: Usage: /usr/bin/mysql_config [OPTIONS]
+Options:
+        --cflags         [-I/usr/include/mysql  -DBIG_JOINS=1  -fno-strict-aliasing   -DUNIV_LINUX -DUNIV_LINUX]
+        --include        [-I/usr/include/mysql]
+        --libs           [-rdynamic -L/usr/lib/mysql -lmysqlclient]
+        --libs_r         [-rdynamic -L/usr/lib/mysql -lmysqlclient_r]
+        --plugindir      [/usr/lib/mysql/plugin]
+        --socket         [/var/run/mysqld/mysqld.sock]
+        --port           [0]
+        --version        [5.1.58]
+        --libmysqld-libs [-rdynamic -L/usr/lib/mysql -lmysqld -ldl -lwrap -lrt], -rdynamic -L/usr/lib/mysql -lmysqlclient
+-- Found MySQL Embedded: Usage: /usr/bin/mysql_config [OPTIONS]
+Options:
+        --cflags         [-I/usr/include/mysql  -DBIG_JOINS=1  -fno-strict-aliasing   -DUNIV_LINUX -DUNIV_LINUX]
+        --include        [-I/usr/include/mysql]
+        --libs           [-rdynamic -L/usr/lib/mysql -lmysqlclient]
+        --libs_r         [-rdynamic -L/usr/lib/mysql -lmysqlclient_r]
+        --plugindir      [/usr/lib/mysql/plugin]
+        --socket         [/var/run/mysqld/mysqld.sock]
+        --port           [0]
+        --version        [5.1.58]
+        --libmysqld-libs [-rdynamic -L/usr/lib/mysql -lmysqld -ldl -lwrap -lrt], -rdynamic -L/usr/lib/mysql -lmysqld_pic -ldl -lwrap -lrt -lpthread
+
+ii  libmysqlclient-dev            5.1.58-1                      MySQL database development files
+--- a/cmake/modules/FindMySQLAmarok.cmake
++++ b/cmake/modules/FindMySQLAmarok.cmake
+@@ -17,7 +17,7 @@ if(NOT WIN32)
+ endif(NOT WIN32)
+ 
+ if(MYSQLCONFIG_EXECUTABLE)
+-    exec_program(${MYSQLCONFIG_EXECUTABLE} ARGS --variable=pkgincludedir RETURN_VALUE _return_VALUE OUTPUT_VARIABLE MYSQL_INCLUDE_DIR)
++    exec_program(${MYSQLCONFIG_EXECUTABLE} ARGS --include RETURN_VALUE _return_VALUE OUTPUT_VARIABLE MYSQL_INCLUDE_DIR)
+     exec_program(${MYSQLCONFIG_EXECUTABLE} ARGS --cflags RETURN_VALUE _return_VALUE OUTPUT_VARIABLE MYSQL_CFLAGS)
+     exec_program(${MYSQLCONFIG_EXECUTABLE} ARGS --libs RETURN_VALUE _return_VALUE OUTPUT_VARIABLE MYSQL_LIBRARIES)
+     exec_program(${MYSQLCONFIG_EXECUTABLE} ARGS --libmysqld-libs RETURN_VALUE _return_VALUE OUTPUT_VARIABLE MYSQL_EMBEDDED_LIBSTEMP)
diff --git a/debian/patches/series b/debian/patches/series
index 73089eb..2e0a883 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ upstream_fix_lyrics_autorefresh_in_some_cases.patch
 debian_disable_qtscriptbindings_check_fix.diff
 debian_mysqle_amarok_local_errmsg_feature.diff
 debian_disable_doc_nl.diff
+debian_find_mysql_fix.diff

-- 
Amarok packaging