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

[Modestas Vainius]

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

The following commit has been merged in the master branch:
commit 156873ecae3c936f60ccb91803d7f78b929bb400
Author: Modestas Vainius <modax at debian.org>
Date:   Mon Nov 4 20:43:42 2013 +0200

    Re-enable QtScript bindings which got disabled due to bug.
    
    Fix debian_disable_qtscriptbindings_check_fix.diff
    
    (Closes: #721882)
---
 debian/changelog                                    |    2 ++
 .../debian_disable_qtscriptbindings_check_fix.diff  |   19 +++++--------------
 2 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 66900bf..444e206 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ amarok (2.8.0-2) UNRELEASED; urgency=low
 
   * Drop kdemultimedia-dev build dependency. Apparently, it is not needed.
   * Replace kdemultimedia-kio-plugins Recommends with kio-audiocd.
+  * Re-enable QtScript bindings which got disabled due to bug
+    (fix debian_disable_qtscriptbindings_check_fix.diff) (Closes: #721882)
 
  -- Modestas Vainius <modax at debian.org>  Sun, 18 Aug 2013 21:10:04 +0300
 
diff --git a/debian/patches/debian_disable_qtscriptbindings_check_fix.diff b/debian/patches/debian_disable_qtscriptbindings_check_fix.diff
index e8190ae..1db6052 100644
--- a/debian/patches/debian_disable_qtscriptbindings_check_fix.diff
+++ b/debian/patches/debian_disable_qtscriptbindings_check_fix.diff
@@ -2,29 +2,20 @@ From: Modestas Vainius <modestas at vainius.eu>
 Subject: [PATCH] Disable QtScriptBindings check
 Forwarded; not-needed
 Origin: vendor
-Last-Update: 2011-07-06
+Last-Update: 2013-11-04
 
 QtScriptBindings is a runtime dependency which is not needed at build time.
 Just make cmake think that QtScriptBindings is available.
 
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -95,8 +95,6 @@ add_definitions( ${QT_DEFINITIONS} ${KDE
+@@ -95,7 +95,8 @@ add_definitions( ${QT_DEFINITIONS} ${KDE
  # QCA2 is required for the Script Updater
  find_package( QCA2 )
  
 -find_package( QtScriptQtBindings )
--
++# Package level dependencies ensure that QtScriptBindings exist at runtime
++set(QTSCRIPTQTBINDINGS_FOUND TRUE CACHE BOOL "Just assume QtScriptbindings exist [ Debian-specific ]")
+ 
  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 "" "" )
- 
--    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 ]")
- 
-     find_package(MySQLAmarok REQUIRED)
-     if( WITH_MYSQL_EMBEDDED )

-- 
Amarok packaging