diff -Nru amarok-2.3.1/debian/changelog amarok-2.3.1/debian/changelog
--- amarok-2.3.1/debian/changelog	2010-08-26 15:46:10.000000000 +0100
+++ amarok-2.3.1/debian/changelog	2010-08-27 16:53:37.000000000 +0100
@@ -1,3 +1,10 @@
+amarok (2:2.3.1-1ubuntu7) maverick; urgency=low
+
+  * Add an updated 11_soundmenu_mpris2.0.diff from Aurelien Gateau, as the
+    old patch had issues that caused it to not work
+
+ -- Jonathan Thomas <echidnaman@kubuntu.org>  Fri, 27 Aug 2010 11:52:53 -0400
+
 amarok (2:2.3.1-1ubuntu6) maverick; urgency=low
 
   * Add 11_soundmenu_mpris2.0.diff from Aurlien Gateau, adds mpris2
diff -Nru amarok-2.3.1/debian/patches/debian-changes-2:2.3.1-1ubuntu7 amarok-2.3.1/debian/patches/debian-changes-2:2.3.1-1ubuntu7
--- amarok-2.3.1/debian/patches/debian-changes-2:2.3.1-1ubuntu7	1970-01-01 01:00:00.000000000 +0100
+++ amarok-2.3.1/debian/patches/debian-changes-2:2.3.1-1ubuntu7	2010-08-27 16:53:59.000000000 +0100
@@ -0,0 +1,58 @@
+Description: Upstream changes introduced in version 2:2.3.1-1ubuntu7
+ This patch has been created by dpkg-source during the package build.
+ Here's the last changelog entry, hopefully it gives details on why
+ those changes were made:
+ .
+ amarok (2:2.3.1-1ubuntu7) maverick; urgency=low
+ .
+   * Add an updated 11_soundmenu_mpris2.0.diff from Aurelien Gateau, as the
+     old patch had issues that caused it to not work
+ .
+ The person named in the Author field signed this changelog entry.
+Author: Jonathan Thomas <echidnaman@kubuntu.org>
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- amarok-2.3.1.orig/src/dbus/Mpris2DBusHandler.cpp
++++ amarok-2.3.1/src/dbus/Mpris2DBusHandler.cpp
+@@ -39,7 +39,6 @@
+ #include <KWindowSystem>
+ 
+ static const char *MPRIS2_OBJECT_PATH = "/org/mpris/MediaPlayer2";
+-static const char *MPRIS2_PLAYER_INTERFACE = "org.mpris.MediaPlayer2.Player";
+ static const char *FDO_PROPERTIES_INTERFACE = "org.freedesktop.DBus.Properties";
+ 
+ static QString activeMprisTrackId()
+@@ -308,11 +307,7 @@ namespace Amarok
+         m_changedProperties.clear();
+ 
+         QDBusMessage msg = QDBusMessage::createSignal( MPRIS2_OBJECT_PATH, FDO_PROPERTIES_INTERFACE, "PropertiesChanged" );
+-        QVariantList args = QVariantList()
+-            << MPRIS2_PLAYER_INTERFACE
+-            << map
+-            << QStringList();
+-        msg.setArguments( args );
++        msg.setArguments( QVariantList() << map );
+         QDBusConnection::sessionBus().send( msg );
+     }
+ 
+@@ -407,7 +402,7 @@ namespace Amarok
+         setPropertyInternal( "CanPlay", status != Playing );
+         setPropertyInternal( "CanPause", status == Playing );
+         setPropertyInternal( "CanSeek", status != Stopped );
+-        setPropertyInternal( "Metadata", metaData );
++        setPropertyInternal( "MetaData", metaData );
+ 
+         schedulePropertiesChangedEmission();
+     }
diff -Nru amarok-2.3.1/debian/patches/kubuntu/11_soundmenu_mpris2.0.diff amarok-2.3.1/debian/patches/kubuntu/11_soundmenu_mpris2.0.diff
--- amarok-2.3.1/debian/patches/kubuntu/11_soundmenu_mpris2.0.diff	2010-08-26 15:45:36.000000000 +0100
+++ amarok-2.3.1/debian/patches/kubuntu/11_soundmenu_mpris2.0.diff	2010-08-26 17:35:20.000000000 +0100
@@ -1,7 +1,7 @@
 Index: amarok-2.3.1/src/App.cpp
 ===================================================================
---- amarok-2.3.1.orig/src/App.cpp	2010-08-25 09:54:59.000000000 +0200
-+++ amarok-2.3.1/src/App.cpp	2010-08-26 15:48:20.000000000 +0200
+--- amarok-2.3.1.orig/src/App.cpp	2010-08-26 17:27:57.000000000 +0200
++++ amarok-2.3.1/src/App.cpp	2010-08-26 17:28:28.000000000 +0200
 @@ -36,6 +36,7 @@
  #include "core/meta/support/MetaConstants.h"
  #include "core/meta/Meta.h"
@@ -30,8 +30,8 @@
  #ifdef HAVE_INDICATEQT
 Index: amarok-2.3.1/src/CMakeLists.txt
 ===================================================================
---- amarok-2.3.1.orig/src/CMakeLists.txt	2010-08-25 09:54:59.000000000 +0200
-+++ amarok-2.3.1/src/CMakeLists.txt	2010-08-26 15:47:49.000000000 +0200
+--- amarok-2.3.1.orig/src/CMakeLists.txt	2010-08-26 17:27:57.000000000 +0200
++++ amarok-2.3.1/src/CMakeLists.txt	2010-08-26 17:28:03.000000000 +0200
 @@ -483,6 +483,7 @@
      dbus/TracklistDBusHandler.cpp
      dbus/CollectionDBusHandler.cpp
@@ -51,8 +51,8 @@
  set( amaroklib_DEPENDS "amarokcore" )
 Index: amarok-2.3.1/src/core/meta/support/MetaUtility.cpp
 ===================================================================
---- amarok-2.3.1.orig/src/core/meta/support/MetaUtility.cpp	2010-05-27 20:37:21.000000000 +0200
-+++ amarok-2.3.1/src/core/meta/support/MetaUtility.cpp	2010-08-26 15:47:49.000000000 +0200
+--- amarok-2.3.1.orig/src/core/meta/support/MetaUtility.cpp	2010-08-26 15:57:45.000000000 +0200
++++ amarok-2.3.1/src/core/meta/support/MetaUtility.cpp	2010-08-26 17:28:03.000000000 +0200
 @@ -150,6 +150,74 @@
      return map;
  }
@@ -130,8 +130,8 @@
  Meta::Field::updateTrack( Meta::TrackPtr track, const QVariantMap &metadata )
 Index: amarok-2.3.1/src/core/meta/support/MetaUtility.h
 ===================================================================
---- amarok-2.3.1.orig/src/core/meta/support/MetaUtility.h	2010-05-27 20:37:21.000000000 +0200
-+++ amarok-2.3.1/src/core/meta/support/MetaUtility.h	2010-08-26 15:47:49.000000000 +0200
+--- amarok-2.3.1.orig/src/core/meta/support/MetaUtility.h	2010-08-26 15:57:45.000000000 +0200
++++ amarok-2.3.1/src/core/meta/support/MetaUtility.h	2010-08-26 17:28:03.000000000 +0200
 @@ -62,8 +62,10 @@
  
          //deprecated
@@ -147,8 +147,8 @@
 Index: amarok-2.3.1/src/dbus/Mpris2DBusHandler.cpp
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ amarok-2.3.1/src/dbus/Mpris2DBusHandler.cpp	2010-08-26 15:47:49.000000000 +0200
-@@ -0,0 +1,429 @@
++++ amarok-2.3.1/src/dbus/Mpris2DBusHandler.cpp	2010-08-26 17:28:03.000000000 +0200
+@@ -0,0 +1,434 @@
 +/****************************************************************************************
 + * Copyright (c) 2008 Ian Monroe <ian@monroe.nu>                                        *
 + * Copyright (c) 2008 Peter ZHOU <peterzhoulei@gmail.com>                               *
@@ -190,6 +190,7 @@
 +#include <KWindowSystem>
 +
 +static const char *MPRIS2_OBJECT_PATH = "/org/mpris/MediaPlayer2";
++static const char *MPRIS2_PLAYER_INTERFACE = "org.mpris.MediaPlayer2.Player";
 +static const char *FDO_PROPERTIES_INTERFACE = "org.freedesktop.DBus.Properties";
 +
 +static QString activeMprisTrackId()
@@ -458,7 +459,11 @@
 +        m_changedProperties.clear();
 +
 +        QDBusMessage msg = QDBusMessage::createSignal( MPRIS2_OBJECT_PATH, FDO_PROPERTIES_INTERFACE, "PropertiesChanged" );
-+        msg.setArguments( QVariantList() << map );
++        QVariantList args = QVariantList()
++            << MPRIS2_PLAYER_INTERFACE
++            << map
++            << QStringList();
++        msg.setArguments( args );
 +        QDBusConnection::sessionBus().send( msg );
 +    }
 +
@@ -553,7 +558,7 @@
 +        setPropertyInternal( "CanPlay", status != Playing );
 +        setPropertyInternal( "CanPause", status == Playing );
 +        setPropertyInternal( "CanSeek", status != Stopped );
-+        setPropertyInternal( "MetaData", metaData );
++        setPropertyInternal( "Metadata", metaData );
 +
 +        schedulePropertiesChangedEmission();
 +    }
@@ -581,7 +586,7 @@
 Index: amarok-2.3.1/src/dbus/Mpris2DBusHandler.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ amarok-2.3.1/src/dbus/Mpris2DBusHandler.h	2010-08-26 15:47:49.000000000 +0200
++++ amarok-2.3.1/src/dbus/Mpris2DBusHandler.h	2010-08-26 17:28:03.000000000 +0200
 @@ -0,0 +1,170 @@
 +/****************************************************************************************
 + * Copyright (c) 2010 Canonical Ltd                                                     *
@@ -756,7 +761,7 @@
 Index: amarok-2.3.1/src/dbus/org.mpris.MediaPlayer2.Player.xml
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ amarok-2.3.1/src/dbus/org.mpris.MediaPlayer2.Player.xml	2010-08-26 15:47:49.000000000 +0200
++++ amarok-2.3.1/src/dbus/org.mpris.MediaPlayer2.Player.xml	2010-08-26 17:28:03.000000000 +0200
 @@ -0,0 +1,86 @@
 +<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
 +"http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
@@ -847,7 +852,7 @@
 Index: amarok-2.3.1/src/dbus/org.mpris.MediaPlayer2.root.xml
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ amarok-2.3.1/src/dbus/org.mpris.MediaPlayer2.root.xml	2010-08-26 15:47:49.000000000 +0200
++++ amarok-2.3.1/src/dbus/org.mpris.MediaPlayer2.root.xml	2010-08-26 17:28:03.000000000 +0200
 @@ -0,0 +1,25 @@
 +<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
 +          "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
@@ -877,7 +882,7 @@
 Index: amarok-2.3.1/tests/mpristest.py
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ amarok-2.3.1/tests/mpristest.py	2010-08-26 15:47:49.000000000 +0200
++++ amarok-2.3.1/tests/mpristest.py	2010-08-26 17:28:03.000000000 +0200
 @@ -0,0 +1,65 @@
 +import subprocess
 +import time
diff -Nru amarok-2.3.1/debian/patches/series amarok-2.3.1/debian/patches/series
--- amarok-2.3.1/debian/patches/series	2010-08-26 15:45:40.000000000 +0100
+++ amarok-2.3.1/debian/patches/series	2010-08-27 16:53:59.000000000 +0100
@@ -8,3 +8,4 @@
 kubuntu/09_fix_applet_destructor_crash.diff
 kubuntu/10_soundmenu_support.diff
 kubuntu/11_soundmenu_mpris2.0.diff
+debian-changes-2:2.3.1-1ubuntu7