Merge lp:~jbicha/ubuntu/oneiric/desktop-file-utils/update-nautilus-listing into lp:ubuntu/oneiric/desktop-file-utils

[Jeremy Bícha]

[Michael Terry (mterry)]

Looks good, thanks! I applied this patch to lp:~ubuntu-desktop/desktop-file-utils/ubuntu though, instead of lp:ubuntu/desktop-file-utils, since the former is where the packaging branch lives.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2011-07-21 08:33:21 +0000
+++ debian/changelog	2011-07-31 17:03:33 +0000
@@ -1,3 +1,12 @@
+desktop-file-utils (0.18-0ubuntu8) oneiric; urgency=low
+
+  * debian/defaults.list
+    - Use nautilus.desktop as default directory handler since
+      upstream removed nautilus-file-handler.desktop 
+    - Remove deprecated x-directory listing
+
+ -- Jeremy Bicha <[e-mail]>  Sun, 31 Jul 2011 12:49:55 -0400
+
 desktop-file-utils (0.18-0ubuntu7) oneiric; urgency=low
 
   [ Didier Roche ]
 
=== modified file 'debian/defaults.list'
--- debian/defaults.list	2011-07-21 08:33:21 +0000
+++ debian/defaults.list	2011-07-31 17:03:33 +0000
@@ -162,7 +162,7 @@
 image/x-psd=gimp.desktop
 image/x-xbitmap=eog.desktop
 image/x-xpixmap=eog.desktop
-inode/directory=nautilus-folder-handler.desktop
+inode/directory=nautilus.desktop
 misc/ultravox=banshee.desktop
 multipart/x-zip=file-roller.desktop
 text/abiword=abiword.desktop
@@ -219,7 +219,6 @@
 video/x-ogm+ogg=totem.desktop
 video/x-theora+ogg=totem.desktop
 video/x-totem-stream=totem.desktop
-x-directory/normal=nautilus-folder-handler.desktop
 x-content/video-dvd=totem.desktop
 x-content/video-vcd=totem.desktop
 x-content/video-svcd=totem.desktop