[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=ed7f125

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

    Adapt debian_disable_qtscriptbindings_check_fix.diff to upstream changes.
---
 debian/changelog                                     |    1 +
 .../debian_disable_qtscriptbindings_check_fix.diff   |   18 +++++++++++++-----
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3c5c178..25e80d5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ amarok (2.8.0-0r1) UNRELEASED; urgency=low
     KDE 4.9 so they will trigger FTBFS. We are not quite there yet with amarok
     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.
 
   [ Maximiliano Curia ]
   * Update watch file.
diff --git a/debian/patches/debian_disable_qtscriptbindings_check_fix.diff b/debian/patches/debian_disable_qtscriptbindings_check_fix.diff
index 6b1388d..e8190ae 100644
--- a/debian/patches/debian_disable_qtscriptbindings_check_fix.diff
+++ b/debian/patches/debian_disable_qtscriptbindings_check_fix.diff
@@ -9,14 +9,22 @@ Just make cmake think that QtScriptBindings is available.
 
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -95,8 +95,8 @@ if( WITH_PLAYER )
+@@ -95,8 +95,6 @@ add_definitions( ${QT_DEFINITIONS} ${KDE
+ # QCA2 is required for the Script Updater
+ find_package( QCA2 )
  
-     macro_log_feature( KDE4_FOUND "kdelibs" "The toolkit Amarok uses to build" "http://www.kde.org" TRUE ${KDE_MIN_VERSION} "" )
+-find_package( QtScriptQtBindings )
+-
+ macro_optional_find_package( LibLastFm )
+ set( LIBLASTFM_MIN_VERSION "1.0.0" )
+ if( LIBLASTFM_FOUND )
+@@ -132,7 +130,8 @@ if( WITH_PLAYER )
+ 
+     macro_log_feature( QT_QTOPENGL_FOUND "QtOpenGL" "Required for the spectrum analyzer" "http://qt-project.org" FALSE "" "" )
  
--    find_package( QtScriptQtBindings )
 -    macro_log_feature( QTSCRIPTQTBINDINGS_FOUND "qtscript-qt" "QtScript Qt Bindings" "http://code.google.com/p/qtscriptgenerator/" FALSE "" "" )
 +    # Package level dependencies ensure that QtScriptBindings exist at runtime
 +    set(QTSCRIPTQTBINDINGS_FOUND TRUE CACHE BOOL "Just assume QtScriptbindings exist [ Debian-specific ]")
  
-     add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
- 
+     find_package(MySQLAmarok REQUIRED)
+     if( WITH_MYSQL_EMBEDDED )

-- 
Amarok packaging