r20196 - in /desktop/unstable/nautilus/debian: changelog patches/11_restart_mode.patch patches/13_autostart.patch patches/series

joss at users.alioth.debian.org joss at users.alioth.debian.org
Sun May 31 15:53:13 UTC 2009


Author: joss
Date: Sun May 31 15:53:13 2009
New Revision: 20196

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=20196
Log:
* 11_restart_mode.patch: removed, it is useless now that we never 
  autorespawn nautilus. Furthermore, nautilus-home.desktop is lacking 
  a X-GNOME-Provides: field.
* 13_autostart.patch: refreshed accordingly.

Removed:
    desktop/unstable/nautilus/debian/patches/11_restart_mode.patch
Modified:
    desktop/unstable/nautilus/debian/changelog
    desktop/unstable/nautilus/debian/patches/13_autostart.patch
    desktop/unstable/nautilus/debian/patches/series

Modified: desktop/unstable/nautilus/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/changelog?rev=20196&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/changelog (original)
+++ desktop/unstable/nautilus/debian/changelog Sun May 31 15:53:13 2009
@@ -1,3 +1,12 @@
+nautilus (2.26.2-5) unstable; urgency=low
+
+  * 11_restart_mode.patch: removed, it is useless now that we never 
+    autorespawn nautilus. Furthermore, nautilus-home.desktop is lacking 
+    a X-GNOME-Provides: field.
+  * 13_autostart.patch: refreshed accordingly.
+
+ -- Josselin Mouette <joss at debian.org>  Sun, 31 May 2009 17:53:10 +0200
+
 nautilus (2.26.2-4) unstable; urgency=low
 
   * 11_restart_mode.patch: add reference.

Modified: desktop/unstable/nautilus/debian/patches/13_autostart.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/patches/13_autostart.patch?rev=20196&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/patches/13_autostart.patch (original)
+++ desktop/unstable/nautilus/debian/patches/13_autostart.patch Sun May 31 15:53:13 2009
@@ -1,7 +1,9 @@
+Part of the fix for Debian #525718 (GNOME #571417).
+
 Index: nautilus-2.26.2/Makefile.am
 ===================================================================
---- nautilus-2.26.2.orig/Makefile.am	2009-05-31 13:37:15.641665893 +0200
-+++ nautilus-2.26.2/Makefile.am	2009-05-31 13:39:30.522302392 +0200
+--- nautilus-2.26.2.orig/Makefile.am	2009-05-31 17:36:35.209666581 +0200
++++ nautilus-2.26.2/Makefile.am	2009-05-31 17:37:45.070166522 +0200
 @@ -5,7 +5,6 @@ include $(top_srcdir)/Makefile.shared
  desktopdir       = $(datadir)/applications
  desktop_DATA     = $(desktop_in_files:.desktop.in=.desktop)
@@ -23,8 +25,8 @@
  	libnautilus-extension	\
 Index: nautilus-2.26.2/nautilus.desktop.in.in
 ===================================================================
---- nautilus-2.26.2.orig/nautilus.desktop.in.in	2009-05-31 13:35:47.754168589 +0200
-+++ nautilus-2.26.2/nautilus.desktop.in.in	2009-05-31 14:25:03.266648733 +0200
+--- nautilus-2.26.2.orig/nautilus.desktop.in.in	2009-05-31 17:36:35.237669649 +0200
++++ nautilus-2.26.2/nautilus.desktop.in.in	2009-05-31 17:37:45.070166522 +0200
 @@ -6,13 +6,12 @@ Icon=system-file-manager
  Terminal=false
  Type=Application
@@ -42,16 +44,16 @@
  X-GNOME-Provides=filemanager
 Index: nautilus-2.26.2/src/nautilus-main.c
 ===================================================================
---- nautilus-2.26.2.orig/src/nautilus-main.c	2009-05-31 13:34:07.889665421 +0200
-+++ nautilus-2.26.2/src/nautilus-main.c	2009-05-31 13:34:31.538266282 +0200
-@@ -466,8 +466,8 @@ main (int argc, char *argv[])
- 	if ((no_desktop || !eel_preferences_get_boolean (NAUTILUS_PREFERENCES_SHOW_DESKTOP))
- 	    && g_file_test (DATADIR "/applications/nautilus-home.desktop", G_FILE_TEST_EXISTS)) {
- 		egg_set_desktop_file (DATADIR "/applications/nautilus-home.desktop");
--	} else if (g_file_test (DATADIR "/applications/nautilus.desktop", G_FILE_TEST_EXISTS)) {
+--- nautilus-2.26.2.orig/src/nautilus-main.c	2009-05-31 17:36:37.185668213 +0200
++++ nautilus-2.26.2/src/nautilus-main.c	2009-05-31 17:38:19.237663432 +0200
+@@ -391,8 +391,8 @@ main (int argc, char *argv[])
+ 	browser_window = FALSE;
+ 
+ 	g_set_prgname ("nautilus");
+-	if (g_file_test (DATADIR "/applications/nautilus.desktop", G_FILE_TEST_EXISTS)) {
 -		egg_set_desktop_file (DATADIR "/applications/nautilus.desktop");
-+	} else if (g_file_test (DATADIR "/gnome/autostart/nautilus.desktop", G_FILE_TEST_EXISTS)) {
++	if (g_file_test (DATADIR "/gnome/autostart/nautilus.desktop", G_FILE_TEST_EXISTS)) {
 +		egg_set_desktop_file (DATADIR "/gnome/autostart/nautilus.desktop");
  	}
  
- 	application = NULL;
+ 	context = g_option_context_new (_("\n\nBrowse the file system with the file manager"));

Modified: desktop/unstable/nautilus/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/patches/series?rev=20196&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/patches/series (original)
+++ desktop/unstable/nautilus/debian/patches/series Sun May 31 15:53:13 2009
@@ -2,7 +2,6 @@
 01_manpage.patch
 02_eel_libadd.patch
 10_load_session.patch
-11_restart_mode.patch
 12_list-view_expand.patch
 13_autostart.patch
 20_open-with_install.patch




More information about the pkg-gnome-commits mailing list