diff -u rhythmbox-ubuntuone-music-store-0.0.9/debian/changelog rhythmbox-ubuntuone-music-store-0.0.9/debian/changelog
--- rhythmbox-ubuntuone-music-store-0.0.9/debian/changelog
+++ rhythmbox-ubuntuone-music-store-0.0.9/debian/changelog
@@ -1,3 +1,11 @@
+rhythmbox-ubuntuone-music-store (0.0.9-0ubuntu2) maverick; urgency=low
+
+  * Use Fluendo MP3 package from Universe not Partner reprositories
+    and correct related callbacks, addressing MP3 codec installation failure
+    (closes LP#594450)
+
+ -- Daniel J Blueman <daniel.blueman@gmail.com>  Wed, 23 Jun 2010 12:49:58 +0100
+
 rhythmbox-ubuntuone-music-store (0.0.9-0ubuntu1) lucid; urgency=low
 
   * New upstream release.
only in patch2:
unchanged:
--- rhythmbox-ubuntuone-music-store-0.0.9.orig/umusicstore/__init__.py
+++ rhythmbox-ubuntuone-music-store-0.0.9/umusicstore/__init__.py
@@ -355,19 +355,13 @@
         self.add(self.install_box)
 
     def _start_mp3_install(self, btn):
-        """Add the 'partner' repository and update the package list from it."""
+        """Update the package list."""
         self.ac = aptdaemon.client.AptClient()
-        try:
-            self.ac.add_repository("deb","http://archive.canonical.com/", "lucid", ["partner"])
-        except dbus.exceptions.DBusException, e:
-            if e.get_dbus_name() == "org.freedesktop.PolicyKit.Error.NotAuthorized":
-                # user cancelled, so exit from here so they can press the button again
-                return
         self.ac.update_cache(reply_handler=self._finish_updating_packages,
                         error_handler=self._on_error)
     
     def _finish_updating_packages(self, transaction):
-        """Now that partner is added, install our mp3 codec package."""
+        """Install mp3 codec package."""
         self.update_progress = AptProgressBar(transaction)
         self.update_progress.show()
         self.install_label_head.set_text("")
@@ -377,7 +371,7 @@
         self.install_vbox.pack_start(self.update_progress, expand=False)
         transaction.run(reply_handler=lambda: True, 
                         error_handler=self._on_error)
-        self.ac.install_packages(["gstreamer0.10-fluendo-plugins-mp3-partner"],
+        self.ac.install_packages(["gstreamer0.10-fluendo-mp3"],
                         reply_handler=self._run_transaction,
                         error_handler=self._on_error)
 
@@ -397,13 +391,13 @@
 
     def _finished(self, trans, exit_code):
         """Aptdaemon package installation finished; show music store."""
-        if exit_code == 0 or exit_code == 2: # 0: success, 2: already installed
+        if exit_code == 'exit-success':
             self.remove(self.install_box)
             gst.update_registry()
             self.add_music_store_widget()
         else:
             self._on_error("Could not find the "
-                "gstreamer0.10-fluendo-plugins-mp3-partner package.")
+                "gstreamer0.10-fluendo-mp3 package")
 
     def _on_error(self, error):
         """Error handler for aptdaemon."""
only in patch2:
unchanged:
--- rhythmbox-ubuntuone-music-store-0.0.9.orig/po/rhythmbox-ubuntuone-music-store.pot
+++ rhythmbox-ubuntuone-music-store-0.0.9/po/rhythmbox-ubuntuone-music-store.pot
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-25 10:30+0100\n"
+"POT-Creation-Date: 2010-06-23 13:14+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,37 +17,41 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Translators: this is the name under Music for U1 music in Rhythmbox
-#: ../umusicstore/__init__.py:172
+#: ../umusicstore/__init__.py:181
 msgid "Purchased from Ubuntu One"
 msgstr ""
 
-#: ../umusicstore/__init__.py:243
+#: ../umusicstore/__init__.py:266
 msgid "Ubuntu One"
 msgstr ""
 
-#: ../umusicstore/__init__.py:288
+#: ../umusicstore/__init__.py:315
 msgid "MP3 plugins are not installed"
 msgstr ""
 
-#: ../umusicstore/__init__.py:293
+#: ../umusicstore/__init__.py:320
 msgid ""
 "To listen to your purchased songs, you need to install MP3 plugins. Click "
 "below to install them."
 msgstr ""
 
-#: ../umusicstore/__init__.py:298
+#: ../umusicstore/__init__.py:344
 msgid "Install MP3 plugins"
 msgstr ""
 
-#: ../umusicstore/__init__.py:320
+#: ../umusicstore/__init__.py:368
+msgid "Finding MP3 plugins"
+msgstr ""
+
+#: ../umusicstore/__init__.py:384
 msgid "Installing MP3 plugins"
 msgstr ""
 
-#: ../umusicstore/__init__.py:340
+#: ../umusicstore/__init__.py:405
 msgid "There was a problem installing, sorry"
 msgstr ""
 
-#: ../umusicstore/__init__.py:343
+#: ../umusicstore/__init__.py:408
 msgid "Check your internet connection and try again."
 msgstr ""