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

[Modestas Vainius]

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

The following commit has been merged in the experimental branch:
commit 852eff5dd4709b352ac983e3cfd84ae7d6ffd73f
Author: Modestas Vainius <modax at debian.org>
Date:   Sun Jun 3 00:01:46 2012 +0300

    Drop upstream_fix_lyrics_autorefresh_in_some_cases.patch, merged upstream.
---
 debian/changelog                                   |    1 +
 debian/patches/series                              |    1 -
 ...ream_fix_lyrics_autorefresh_in_some_cases.patch |   29 --------------------
 3 files changed, 1 insertions(+), 30 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0a22994..35889fd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 amarok (2.6~beta1-0r1) UNRELEASED; urgency=low
 
   * New upstream development release (2.5.90).
+  * Drop upstream_fix_lyrics_autorefresh_in_some_cases.patch, merged upstream.
 
  -- Modestas Vainius <modax at debian.org>  Sun, 03 Jun 2012 00:00:29 +0300
 
diff --git a/debian/patches/series b/debian/patches/series
index e56486e..2c7a020 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-upstream_fix_lyrics_autorefresh_in_some_cases.patch
 debian_disable_qtscriptbindings_check_fix.diff
 debian_mysqle_amarok_local_errmsg_feature.diff
 debian_mysqle_force_defaults_file.diff
diff --git a/debian/patches/upstream_fix_lyrics_autorefresh_in_some_cases.patch b/debian/patches/upstream_fix_lyrics_autorefresh_in_some_cases.patch
deleted file mode 100644
index 8df7182..0000000
--- a/debian/patches/upstream_fix_lyrics_autorefresh_in_some_cases.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From: Modestas Vainius <modax at debian.org>
-Date: Thu, 28 Jul 2011 16:02:26 +0300
-Subject: [PATCH] Fix lyrics autorefresh in some cases.
-Forwarded: http://git.reviewboard.kde.org/r/102110/
-Origin: vendor
-
-There were some issues mostly when playing streams. Lyrics would stuck with
-empty text and wouldn't autorefresh until the track was changed or manually
-refreshed. That's because cachedLyrics() is always empty for streams. Therefore
-it makes sense to additionally check if either artist or track title have
-changed as well.
----
- src/context/engines/lyrics/LyricsEngine.cpp |    5 ++++-
- 1 files changed, 4 insertions(+), 1 deletions(-)
-
---- a/src/context/engines/lyrics/LyricsEngine.cpp
-+++ b/src/context/engines/lyrics/LyricsEngine.cpp
-@@ -66,7 +66,10 @@ void LyricsEngine::onTrackMetadataChange
-     DEBUG_BLOCK
- 
-     // Only update if the lyrics have changed.
--    if( m_prevLyrics.text != track->cachedLyrics() )
-+    QString artist = track->artist() ? track->artist()->name() : QString();
-+    if( m_prevLyrics.artist != artist ||
-+        m_prevLyrics.title != track->name() ||
-+        m_prevLyrics.text != track->cachedLyrics() )
-         update();
- }
- 

-- 
Amarok packaging