← Back to team overview

gnome3-team team mailing list archive

[Merge] lp:~jbicha/ubuntu/natty/nautilus/gnome3ppa-dot-desktop into lp:~gnome3-team/nautilus/ubuntu

 

Jeremy Bicha has proposed merging lp:~jbicha/ubuntu/natty/nautilus/gnome3ppa-dot-desktop into lp:~gnome3-team/nautilus/ubuntu.

Requested reviews:
  GNOME3 Team (gnome3-team)

For more details, see:
https://code.launchpad.net/~jbicha/ubuntu/natty/nautilus/gnome3ppa-dot-desktop/+merge/59612

Two related bugs, both submitted to GNOME:
https://bugzilla.gnome.org/show_bug.cgi?id=649063
https://bugzilla.gnome.org/show_bug.cgi?id=649074

This branch allows for Nautilus to draw the desktop icons but does not set it as default since the file browser doesn't seem to work right when it does that.
-- 
https://code.launchpad.net/~jbicha/ubuntu/natty/nautilus/gnome3ppa-dot-desktop/+merge/59612
Your team GNOME3 Team is requested to review the proposed merge of lp:~jbicha/ubuntu/natty/nautilus/gnome3ppa-dot-desktop into lp:~gnome3-team/nautilus/ubuntu.
=== modified file 'debian/changelog'
--- debian/changelog	2011-04-11 14:36:01 +0000
+++ debian/changelog	2011-05-01 11:38:27 +0000
@@ -1,3 +1,12 @@
+nautilus (1:3.0.0-0ubuntu1~build4) natty; urgency=low
+
+  * debian/patches/19_dot_desktop.patch
+    - Register Nautilus as a desktop icon filemanager
+    - Re-add nautilus-home.desktop, removed upstream but
+      required for Unity launcher
+
+ -- Jeremy Bicha <jeremy@xxxxxxxxx>  Sun, 01 May 2011 05:29:42 -0400
+
 nautilus (1:3.0.0-0ubuntu1~build3) natty; urgency=low
 
   * debian/control:

=== added file 'debian/nautilus-home.desktop'
--- debian/nautilus-home.desktop	1970-01-01 00:00:00 +0000
+++ debian/nautilus-home.desktop	2011-05-01 11:38:27 +0000
@@ -0,0 +1,15 @@
+[Desktop Entry]
+Name=Home Folder
+Comment=Open your personal folder
+Exec=nautilus
+Icon=user-home
+Terminal=false
+StartupNotify=true
+Type=Application
+OnlyShowIn=GNOME;
+Categories=GNOME;GTK;Core;
+X-GNOME-Bugzilla-Bugzilla=GNOME
+X-GNOME-Bugzilla-Product=nautilus
+X-GNOME-Bugzilla-Component=general
+X-GNOME-Bugzilla-Version=3.0.0
+X-Ubuntu-Gettext-Domain=nautilus

=== modified file 'debian/nautilus.install'
--- debian/nautilus.install	2010-06-04 01:55:37 +0000
+++ debian/nautilus.install	2011-05-01 11:38:27 +0000
@@ -1,4 +1,5 @@
 debian/mount-archive.desktop usr/share/applications
+debian/nautilus-home.desktop usr/share/applications
 debian/tmp/usr/bin
 debian/tmp/usr/lib/nautilus
 debian/tmp/usr/share/applications

=== added file 'debian/patches/19_dot_desktop.patch'
--- debian/patches/19_dot_desktop.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/19_dot_desktop.patch	2011-05-01 11:38:27 +0000
@@ -0,0 +1,15 @@
+Description: Register Nautilus as a filemanager so it can draw desktop icons (Gnome #649074)
+Author: Jeremy Bicha
+
+Index: nautilus-3.0.0/data/nautilus.desktop
+===================================================================
+--- nautilus-3.0.0.orig/data/nautilus.desktop	2011-04-04 10:03:00.000000000 -0400
++++ nautilus-3.0.0/data/nautilus.desktop	2011-05-01 06:49:48.166999396 -0400
+@@ -98,6 +98,7 @@
+ OnlyShowIn=GNOME;
+ Categories=GNOME;GTK;Utility;Core;
+ MimeType=inode/directory;application/x-gnome-saved-search;
++X-GNOME-Provides=filemanager
+ X-GNOME-Bugzilla-Bugzilla=GNOME
+ X-GNOME-Bugzilla-Product=nautilus
+ X-GNOME-Bugzilla-Component=general

=== modified file 'debian/patches/series'
--- debian/patches/series	2011-03-29 12:47:34 +0000
+++ debian/patches/series	2011-05-01 11:38:27 +0000
@@ -4,6 +4,7 @@
 #12_list-view_expand.patch
 15_translations_list_update.patch
 16_desktop_menu_export.patch
+19_dot_desktop.patch
 80_suppress_umount_in_ltsp.patch
 82_gnome-app-install.patch
 83_never_exec_nonexec_launchers.patch


Follow ups