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

[Modestas Vainius]

The following commit has been merged in the master branch:
commit 768697f7742c2e49afc9067b240bb2644db25ca4
Author: Modestas Vainius <modax at debian.org>
Date:   Wed Jul 6 15:23:43 2011 +0300

    Adapt debian_disable_qtscriptbindings_check_fix.diff to upstream changes.
---
 debian/changelog                                   |    1 +
 .../debian_disable_qtscriptbindings_check_fix.diff |   20 ++++++++++++--------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d4f3988..efc7dd7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ amarok (2.4.2~beta1-0r1) UNRELEASED; urgency=low
     document committing/uploading rules in README.source.
   * Update documentation about Phonon backends in Amarok bug-presubj.
     (Closes: #629208)
+  * Adapt debian_disable_qtscriptbindings_check_fix.diff to upstream changes.
 
  -- Modestas Vainius <modax at debian.org>  Sat, 04 Jun 2011 20:38:34 +0300
 
diff --git a/debian/patches/debian_disable_qtscriptbindings_check_fix.diff b/debian/patches/debian_disable_qtscriptbindings_check_fix.diff
index 13d6003..ffd3405 100644
--- a/debian/patches/debian_disable_qtscriptbindings_check_fix.diff
+++ b/debian/patches/debian_disable_qtscriptbindings_check_fix.diff
@@ -1,18 +1,22 @@
 From: Modestas Vainius <modestas at vainius.eu>
 Subject: [PATCH] Disable QtScriptBindings check
+Forwarded; not-needed
+Origin: vendor
+Last-Update: 2011-07-06
 
-QtScriptBindings is a runtime dependency which is not
-needed at build time. Disable cmake check.
+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
-@@ -79,9 +79,6 @@ if( WITH_PLAYER )
+@@ -90,8 +90,8 @@ if( WITH_PLAYER )
+     macro_ensure_version( "4.5.0" ${KDE_VERSION} KDE_HAS_KIMAGECACHE )
+     macro_bool_to_01( KDE_HAS_KIMAGECACHE HAVE_KIMAGECACHE )
  
-     macro_log_feature( KDE4_FOUND "kdelibs" "The toolkit Amarok uses to build" "http://www.kde.org" TRUE "4.4.0" "" )
+-    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 ]")
  
--    find_package( QtScriptQtBindings REQUIRED )
--    macro_log_feature( QTSCRIPTQTBINDINGS_FOUND "qtscript-qt" "QtScript Qt Bindings" "http://code.google.com/p/qtscriptgenerator/" TRUE "" "" )
--
      add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
  
-     find_package(MySQLAmarok REQUIRED)

-- 
Amarok packaging