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

[Modestas Vainius]

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

The following commit has been merged in the master branch:
commit 37be37f8edb70719b93aa3b1687aa9c06a088d5c
Author: Modestas Vainius <modax at debian.org>
Date:   Sun Jun 2 01:30:54 2013 +0300

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

diff --git a/debian/changelog b/debian/changelog
index 6a329ff..cb02c5d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ amarok (2.7.1-1) UNRELEASED; urgency=low
     - this release supports liblastfm (>= 1.0.3). (Closes: #710705)
   * Install libamarok_service_lastfm_shared.so into amarok package again.
     It has somehow slipped through my eyes before. (Closes: #702802)
+  * Adapt debian_mysqle_force_defaults_file.diff to upstream changes.
 
  -- Modestas Vainius <modax at debian.org>  Fri, 31 May 2013 23:50:51 +0300
 
diff --git a/debian/patches/debian_mysqle_force_defaults_file.diff b/debian/patches/debian_mysqle_force_defaults_file.diff
index e3964be..e76626b 100644
--- a/debian/patches/debian_mysqle_force_defaults_file.diff
+++ b/debian/patches/debian_mysqle_force_defaults_file.diff
@@ -15,8 +15,8 @@ looking for /etc/mysql/conf.d/ or reading system errmsg.sys.
 +++ b/src/core-impl/collections/db/sql/mysqlecollection/MySqlEmbeddedStorage.cpp
 @@ -92,8 +92,12 @@ MySqlEmbeddedStorage::MySqlEmbeddedStora
  
-     setenv( "MYSQL_HOME", storagePath.toAscii().data(), 1 );
-     setenv( "DEFAULT_HOME_ENV", storagePath.toAscii().data(), 1 );
+     setenv( "MYSQL_HOME", storagePath.toLocal8Bit().data(), 1 );
+     setenv( "DEFAULT_HOME_ENV", storagePath.toLocal8Bit().data(), 1 );
 -    char *args[] = { (char*) "amarok" };
 -    if( mysql_library_init( 1 , args, 0 ) != 0 )
 +    QByteArray defaultsFileArg = QByteArray("--defaults-file=") + QFile::encodeName(defaultsFile);

-- 
Amarok packaging