[SCM] Amarok packaging branch, master, updated. debian/2.4.3-1-11-g0805c91

[Modestas Vainius]

The following commit has been merged in the master branch:
commit fb2d91d42ea35aa6e9967dd6c04bc55c39fe4075
Author: Modestas Vainius <modax at debian.org>
Date:   Sat Dec 17 13:13:48 2011 +0200

    Refresh patches.
---
 debian/changelog                                   |    1 +
 .../debian_disable_qtscriptbindings_check_fix.diff |    6 +++---
 ...ream_fix_lyrics_autorefresh_in_some_cases.patch |    7 +------
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c05050c..76c2c6d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 amarok (2.5.0-0r1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * Refresh patches.
 
  -- Modestas Vainius <modax at debian.org>  Sat, 17 Dec 2011 12:08:05 +0200
 
diff --git a/debian/patches/debian_disable_qtscriptbindings_check_fix.diff b/debian/patches/debian_disable_qtscriptbindings_check_fix.diff
index ffd3405..714873c 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
-@@ -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 )
+@@ -92,8 +92,8 @@ if( WITH_PLAYER )
+ 
+     macro_log_feature( KDE4_FOUND "kdelibs" "The toolkit Amarok uses to build" "http://www.kde.org" TRUE "4.6.0" "" )
  
 -    find_package( QtScriptQtBindings )
 -    macro_log_feature( QTSCRIPTQTBINDINGS_FOUND "qtscript-qt" "QtScript Qt Bindings" "http://code.google.com/p/qtscriptgenerator/" FALSE "" "" )
diff --git a/debian/patches/upstream_fix_lyrics_autorefresh_in_some_cases.patch b/debian/patches/upstream_fix_lyrics_autorefresh_in_some_cases.patch
index f5f85f4..8df7182 100644
--- a/debian/patches/upstream_fix_lyrics_autorefresh_in_some_cases.patch
+++ b/debian/patches/upstream_fix_lyrics_autorefresh_in_some_cases.patch
@@ -13,11 +13,9 @@ changed as well.
  src/context/engines/lyrics/LyricsEngine.cpp |    5 ++++-
  1 files changed, 4 insertions(+), 1 deletions(-)
 
-diff --git a/src/context/engines/lyrics/LyricsEngine.cpp b/src/context/engines/lyrics/LyricsEngine.cpp
-index 2abeb6d..e6188fc 100644
 --- a/src/context/engines/lyrics/LyricsEngine.cpp
 +++ b/src/context/engines/lyrics/LyricsEngine.cpp
-@@ -66,7 +66,10 @@ void LyricsEngine::onTrackMetadataChanged( Meta::TrackPtr track )
+@@ -66,7 +66,10 @@ void LyricsEngine::onTrackMetadataChange
      DEBUG_BLOCK
  
      // Only update if the lyrics have changed.
@@ -29,6 +27,3 @@ index 2abeb6d..e6188fc 100644
          update();
  }
  
--- 
-1.7.5.4
-

-- 
Amarok packaging