Merge lp:~laney/ubuntu/natty/desktop-file-utils/fix-751610 into lp:~ubuntu-desktop/desktop-file-utils/ubuntu

[Iain Lane]

=== modified file 'debian/changelog'
--- debian/changelog	2011-01-18 01:22:43 +0000
+++ debian/changelog	2011-04-06 09:50:55 +0000
@@ -1,3 +1,10 @@
+desktop-file-utils (0.18-0ubuntu2) natty; urgency=low
+
+  * Set Banshee as the default handler for audio/{dvd,cdda,player}
+    mimetypes (LP: #751610)
+
+ -- Iain Lane <[e-mail]>  Wed, 06 Apr 2011 10:37:14 +0100
+
 desktop-file-utils (0.18-0ubuntu1) natty; urgency=low
 
   * New upstream release

=== modified file 'debian/defaults.list'
--- debian/defaults.list	2010-11-22 13:49:55 +0000
+++ debian/defaults.list	2011-04-06 09:50:55 +0000
@@ -220,9 +220,9 @@
 x-content/video-dvd=totem.desktop
 x-content/video-vcd=totem.desktop
 x-content/video-svcd=totem.desktop
-x-content/audio-cdda=rhythmbox.desktop
-x-content/audio-dvd=rhythmbox.desktop
-x-content/audio-player=rhythmbox.desktop
+x-content/audio-cdda=banshee-audiocd.desktop
+x-content/audio-dvd=banshee-audiocd.desktop
+x-content/audio-player=banshee-media-player.desktop
 x-content/image-dcf=f-spot-import.desktop
 x-content/image-picturecd=f-spot-import.desktop
 zz-application/zz-winassoc-xls=openoffice.org-calc.desktop