[SCM] Amarok packaging branch, experimental, updated. debian/2.7.0-1

[Modestas Vainius]

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

The following commit has been merged in the experimental branch:
commit a6f0e996129a62cabbe351cea33fcd0a9ab15e87
Author: Modestas Vainius <modax at debian.org>
Date:   Sun Jan 27 11:26:35 2013 +0200

    Refresh patches.
---
 debian/changelog                                   |    1 +
 .../debian_disable_qtscriptbindings_check_fix.diff |    4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a9dc243..008f5df 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ amarok (2.7.0-0r1) UNRELEASED; urgency=low
   * New upstream release.
   * Really add --no-relax on Alpha (forgot to export appropriate variable).
     (Closes: #684932)
+  * Refresh patches.
 
  -- Modestas Vainius <modax at debian.org>  Sat, 18 Aug 2012 16:19:58 +0300
 
diff --git a/debian/patches/debian_disable_qtscriptbindings_check_fix.diff b/debian/patches/debian_disable_qtscriptbindings_check_fix.diff
index 714873c..6b1388d 100644
--- a/debian/patches/debian_disable_qtscriptbindings_check_fix.diff
+++ b/debian/patches/debian_disable_qtscriptbindings_check_fix.diff
@@ -9,9 +9,9 @@ Just make cmake think that QtScriptBindings is available.
 
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -92,8 +92,8 @@ if( WITH_PLAYER )
+@@ -95,8 +95,8 @@ if( WITH_PLAYER )
  
-     macro_log_feature( KDE4_FOUND "kdelibs" "The toolkit Amarok uses to build" "http://www.kde.org" TRUE "4.6.0" "" )
+     macro_log_feature( KDE4_FOUND "kdelibs" "The toolkit Amarok uses to build" "http://www.kde.org" TRUE ${KDE_MIN_VERSION} "" )
  
 -    find_package( QtScriptQtBindings )
 -    macro_log_feature( QTSCRIPTQTBINDINGS_FOUND "qtscript-qt" "QtScript Qt Bindings" "http://code.google.com/p/qtscriptgenerator/" FALSE "" "" )

-- 
Amarok packaging