[SCM] Amarok packaging branch, master, updated. debian/2.8.0-1

[Modestas Vainius]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/amarok.git;a=commitdiff;h=45f5395

The following commit has been merged in the master branch:
commit 45f53959e76e89bf9a4c005bd3754a3ac6c3d757
Author: Modestas Vainius <modax at debian.org>
Date:   Sun Aug 18 12:28:26 2013 +0300

    Adapt debian_find_mysql_fix.diff to upstream changes.
---
 debian/changelog                          |    1 +
 debian/patches/debian_find_mysql_fix.diff |    6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 25e80d5..39df3d0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ amarok (2.8.0-0r1) UNRELEASED; urgency=low
     tests (Closes: #719425).
   * Build depend on nepomuk-core-dev for KDE 4.9 or higher.
   * Adapt debian_disable_qtscriptbindings_check_fix.diff to upstream changes.
+  * Adapt debian_find_mysql_fix.diff to upstream changes.
 
   [ Maximiliano Curia ]
   * Update watch file.
diff --git a/debian/patches/debian_find_mysql_fix.diff b/debian/patches/debian_find_mysql_fix.diff
index 3374c77..d5ce3d5 100644
--- a/debian/patches/debian_find_mysql_fix.diff
+++ b/debian/patches/debian_find_mysql_fix.diff
@@ -9,8 +9,8 @@ Last-Update: 2012-06-02
  # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
  
  if(NOT WIN32)
--    find_program(MYSQLCONFIG_EXECUTABLE NAMES mysql_config mysql_config5 PATHS ${BIN_INSTALL_DIR} ~/usr/bin /usr/local/bin)
-+    find_program(MYSQLCONFIG_EXECUTABLE NAMES mysql_config_pic mysql_config mysql_config5 PATHS ${BIN_INSTALL_DIR} ~/usr/bin /usr/local/bin)
+-    find_program(MYSQLCONFIG_EXECUTABLE NAMES mysql_config mysql_config5 HINTS ${BIN_INSTALL_DIR})
++    find_program(MYSQLCONFIG_EXECUTABLE NAMES mysql_config_pic mysql_config mysql_config5 HINTS ${BIN_INSTALL_DIR})
  endif(NOT WIN32)
  
- find_path(MYSQL_INCLUDE_DIR mysql.h
+ find_path(MYSQL_INCLUDE_DIR mysql.h PATH_SUFFIXES mysql mysql5/mysql)

-- 
Amarok packaging