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

[Modestas Vainius]

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

The following commit has been merged in the master branch:
commit ca37bd7e92a8d2f9635ca29314e006c05cffd03a
Author: Modestas Vainius <modax at debian.org>
Date:   Sun Aug 18 15:52:20 2013 +0300

    Do not add analyzer applet by default if Phonon backend does not support it.
    
    Patch: backport_dont_add_analyzer_when_not_supported.diff
    Upstream commit: e631534993c03244a36ed013c186ad8bf83ca1fd
---
 debian/changelog                                   |    3 +++
 ...kport_dont_add_analyzer_when_not_supported.diff |   20 ++++++++++++++++++++
 debian/patches/series                              |    1 +
 3 files changed, 24 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 59fb585..71bcf1a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,9 @@ amarok (2.8.0-0r1) UNRELEASED; urgency=low
   * Move amzdownloader into amarok-utils package.
   * Add notes about Phonon backends to README.Debian. Some Amarok features are
     not supported by Phonon VLC backend.
+  * Backport upstream patch which avoids adding analyzer applet by default if
+    Phonon backend does not support it.
+    Patch backport_dont_add_analyzer_when_not_supported.diff
 
   [ Maximiliano Curia ]
   * Update watch file.
diff --git a/debian/patches/backport_dont_add_analyzer_when_not_supported.diff b/debian/patches/backport_dont_add_analyzer_when_not_supported.diff
new file mode 100644
index 0000000..e1890bf
--- /dev/null
+++ b/debian/patches/backport_dont_add_analyzer_when_not_supported.diff
@@ -0,0 +1,20 @@
+From: Mark Kretschmann <kretschmann at kde.org>
+Date: Sun Aug 18 12:22:35 2013 +0200
+Bug: http://bugs.kde.org/323632
+Origin: backport, commit e631534993c03244a36ed013c186ad8bf83ca1fd
+Applied-Upstream: 2.8.1
+
+    Don't add the analyzer applet when Phonon doesn't support it.
+    
+    Stupid... I forgot about that file.
+    
+    BUG: 323632
+    BACKPORT
+
+--- a/data/amarok_homerc
++++ b/data/amarok_homerc
+@@ -1,3 +1,3 @@
+ [Containment 0]
+ firstShowingApplet=0
+-plugins=currenttrack,analyzer,wikipedia,lyrics
++plugins=currenttrack,wikipedia,lyrics
diff --git a/debian/patches/series b/debian/patches/series
index 412be6b..51d852b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+backport_dont_add_analyzer_when_not_supported.diff
 debian_disable_qtscriptbindings_check_fix.diff
 debian_mysqle_amarok_local_errmsg_feature.diff
 debian_mysqle_force_defaults_file.diff

-- 
Amarok packaging