r12015 - in /desktop/unstable/nautilus/debian: ./ patches/

joss at users.alioth.debian.org joss at users.alioth.debian.org
Wed Jul 18 22:10:30 UTC 2007 

Author: joss
Date: Wed Jul 18 22:10:30 2007
New Revision: 12015

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=12015
Log:
* 99_ltmain_as-needed.patch: make --as-needed work for the library
* New upstream release.
* Refresh patches.
* 15_japanese_typo.patch: removed, integrated upstream.

Removed:
    desktop/unstable/nautilus/debian/patches/15_japanese_typo.patch
Modified:
    desktop/unstable/nautilus/debian/changelog
    desktop/unstable/nautilus/debian/patches/03_sftp_connect.patch
    desktop/unstable/nautilus/debian/patches/04_show_backup_files.patch
    desktop/unstable/nautilus/debian/patches/07_desktop_file_activation.patch
    desktop/unstable/nautilus/debian/patches/11_gnomevfs_query_eject.patch
    desktop/unstable/nautilus/debian/patches/14_sidebar_network-protocol.patch

Modified: desktop/unstable/nautilus/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/changelog?rev=12015&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/changelog (original)
+++ desktop/unstable/nautilus/debian/changelog Wed Jul 18 22:10:30 2007
@@ -1,4 +1,4 @@
-nautilus (2.18.1-4) UNRELEASED; urgency=low
+nautilus (2.18.3-1) unstable; urgency=low
 
   [ Josselin Mouette ]
   * 12_list-view_expand.patch: update the minimum width to 20
@@ -6,7 +6,7 @@
   * Update watch file.
   * 13_thumbnail_size_pref.patch: stolen from upstream SVN. Introduces a
     preference to define the thumbnail size (closes: #425400).
-  * 99_ltmain_as-needed.patch: make --as-needed work for the library 
+  * 99_ltmain_as-needed.patch: make --as-needed work for the library
     too.
 
   [ Otavio Salvador ]
@@ -18,7 +18,12 @@
   * 15_japanese_typo.patch: fixes a typo in the Japanese translation. Thanks
     to Kobayashi Noritada for reporting it. (Closes: #430679)
 
- -- Guilherme de S. Pastore <gpastore at gnome.org>  Tue, 26 Jun 2007 12:34:04 -0300
+  [ Josselin Mouette ]
+  * New upstream release.
+  * Refresh patches.
+  * 15_japanese_typo.patch: removed, integrated upstream.
+
+ -- Josselin Mouette <joss at debian.org>  Wed, 18 Jul 2007 23:43:01 +0200
 
 nautilus (2.18.1-3) unstable; urgency=low
 

Modified: desktop/unstable/nautilus/debian/patches/03_sftp_connect.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/patches/03_sftp_connect.patch?rev=12015&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/patches/03_sftp_connect.patch (original)
+++ desktop/unstable/nautilus/debian/patches/03_sftp_connect.patch Wed Jul 18 22:10:30 2007
@@ -1,8 +1,8 @@
-Index: nautilus-2.18.1/src/file-manager/fm-directory-view.c
+Index: nautilus-2.18.3/src/file-manager/fm-directory-view.c
 ===================================================================
---- nautilus-2.18.1.orig/src/file-manager/fm-directory-view.c	2007-04-26 00:30:37.448019750 +0200
-+++ nautilus-2.18.1/src/file-manager/fm-directory-view.c	2007-04-26 00:30:42.220318000 +0200
-@@ -7281,6 +7281,8 @@
+--- nautilus-2.18.3.orig/src/file-manager/fm-directory-view.c	2007-04-11 16:59:21.000000000 +0200
++++ nautilus-2.18.3/src/file-manager/fm-directory-view.c	2007-07-18 23:35:06.747181882 +0200
+@@ -7283,6 +7283,8 @@
  		uri = nautilus_file_get_activation_uri (file);
  		if (uri != NULL &&
  		    (eel_istr_has_prefix (uri, "ftp:") ||

Modified: desktop/unstable/nautilus/debian/patches/04_show_backup_files.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/patches/04_show_backup_files.patch?rev=12015&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/patches/04_show_backup_files.patch (original)
+++ desktop/unstable/nautilus/debian/patches/04_show_backup_files.patch Wed Jul 18 22:10:30 2007
@@ -1,8 +1,8 @@
-Index: nautilus-2.18.1/src/file-manager/fm-directory-view.c
+Index: nautilus-2.18.3/src/file-manager/fm-directory-view.c
 ===================================================================
---- nautilus-2.18.1.orig/src/file-manager/fm-directory-view.c	2007-04-26 00:30:42.220318000 +0200
-+++ nautilus-2.18.1/src/file-manager/fm-directory-view.c	2007-04-26 00:30:47.528649750 +0200
-@@ -1246,6 +1246,7 @@
+--- nautilus-2.18.3.orig/src/file-manager/fm-directory-view.c	2007-07-18 23:35:06.747181882 +0200
++++ nautilus-2.18.3/src/file-manager/fm-directory-view.c	2007-07-18 23:35:13.647575113 +0200
+@@ -1248,6 +1248,7 @@
  	directory_view = FM_DIRECTORY_VIEW (callback_data);
  	
  	directory_view->details->show_hidden_files = gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action));

Modified: desktop/unstable/nautilus/debian/patches/07_desktop_file_activation.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/patches/07_desktop_file_activation.patch?rev=12015&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/patches/07_desktop_file_activation.patch (original)
+++ desktop/unstable/nautilus/debian/patches/07_desktop_file_activation.patch Wed Jul 18 22:10:30 2007
@@ -1,7 +1,7 @@
-Index: nautilus-2.18.1/libnautilus-private/nautilus-file.c
+Index: nautilus-2.18.3/libnautilus-private/nautilus-file.c
 ===================================================================
---- nautilus-2.18.1.orig/libnautilus-private/nautilus-file.c	2007-04-10 14:06:07.000000000 +0200
-+++ nautilus-2.18.1/libnautilus-private/nautilus-file.c	2007-04-26 00:31:03.621655500 +0200
+--- nautilus-2.18.3.orig/libnautilus-private/nautilus-file.c	2007-05-06 14:59:08.000000000 +0200
++++ nautilus-2.18.3/libnautilus-private/nautilus-file.c	2007-07-18 23:35:20.895988177 +0200
 @@ -40,6 +40,7 @@
  #include "nautilus-link-desktop-file.h"
  #include "nautilus-metadata.h"
@@ -10,7 +10,7 @@
  #include "nautilus-search-directory.h"
  #include "nautilus-search-directory-file.h"
  #include "nautilus-thumbnails.h"
-@@ -2754,6 +2755,33 @@
+@@ -2755,6 +2756,33 @@
  		 monitor_remove, (file, client));
  }			      
  
@@ -44,7 +44,7 @@
  
  /* Return the uri associated with the passed-in file, which may not be
   * the actual uri if the file is an desktop file or a nautilus
-@@ -2768,7 +2796,9 @@
+@@ -2769,7 +2797,9 @@
  		return NULL;
  	}
  
@@ -55,7 +55,7 @@
  		return g_strdup (file->details->activation_uri);
  	}
  	
-@@ -5226,6 +5256,12 @@
+@@ -5227,6 +5257,12 @@
  	return nautilus_file_is_mime_type (file, "application/x-desktop");
  }
  
@@ -68,11 +68,11 @@
  /**
   * nautilus_file_is_directory
   * 
-Index: nautilus-2.18.1/src/file-manager/fm-directory-view.c
+Index: nautilus-2.18.3/src/file-manager/fm-directory-view.c
 ===================================================================
---- nautilus-2.18.1.orig/src/file-manager/fm-directory-view.c	2007-04-26 00:30:47.528649750 +0200
-+++ nautilus-2.18.1/src/file-manager/fm-directory-view.c	2007-04-26 00:31:03.625655750 +0200
-@@ -4606,7 +4606,8 @@
+--- nautilus-2.18.3.orig/src/file-manager/fm-directory-view.c	2007-07-18 23:35:13.647575113 +0200
++++ nautilus-2.18.3/src/file-manager/fm-directory-view.c	2007-07-18 23:35:20.903988633 +0200
+@@ -4608,7 +4608,8 @@
  {
  	return (nautilus_file_is_directory (file) ||
  		NAUTILUS_IS_DESKTOP_ICON_FILE (file) ||
@@ -82,7 +82,7 @@
  }
  
  static ActivationAction
-@@ -4687,12 +4688,14 @@
+@@ -4689,12 +4690,14 @@
  	for (node = selection; node != NULL; node = node->next) {
  		file = NAUTILUS_FILE (node->data);
  
@@ -101,10 +101,10 @@
  		/* Only use the default app for open if there is not
  		   a mime mismatch, otherwise we can't use it in the
  		   open with menu */
-Index: nautilus-2.18.1/libnautilus-private/nautilus-file.h
+Index: nautilus-2.18.3/libnautilus-private/nautilus-file.h
 ===================================================================
---- nautilus-2.18.1.orig/libnautilus-private/nautilus-file.h	2007-04-10 14:06:07.000000000 +0200
-+++ nautilus-2.18.1/libnautilus-private/nautilus-file.h	2007-04-26 00:31:03.629656000 +0200
+--- nautilus-2.18.3.orig/libnautilus-private/nautilus-file.h	2006-06-16 17:02:57.000000000 +0200
++++ nautilus-2.18.3/libnautilus-private/nautilus-file.h	2007-07-18 23:35:20.903988633 +0200
 @@ -155,6 +155,7 @@
  char *                  nautilus_file_get_symbolic_link_target_uri      (NautilusFile                   *file);
  gboolean                nautilus_file_is_broken_symbolic_link           (NautilusFile                   *file);

Modified: desktop/unstable/nautilus/debian/patches/11_gnomevfs_query_eject.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/patches/11_gnomevfs_query_eject.patch?rev=12015&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/patches/11_gnomevfs_query_eject.patch (original)
+++ desktop/unstable/nautilus/debian/patches/11_gnomevfs_query_eject.patch Wed Jul 18 22:10:30 2007
@@ -1,7 +1,7 @@
-Index: nautilus-2.18.1/libnautilus-private/nautilus-desktop-link-monitor.c
+Index: nautilus-2.18.3/libnautilus-private/nautilus-desktop-link-monitor.c
 ===================================================================
---- nautilus-2.18.1.orig/libnautilus-private/nautilus-desktop-link-monitor.c	2007-04-10 14:06:07.000000000 +0200
-+++ nautilus-2.18.1/libnautilus-private/nautilus-desktop-link-monitor.c	2007-04-26 00:31:52.720724000 +0200
+--- nautilus-2.18.3.orig/libnautilus-private/nautilus-desktop-link-monitor.c	2006-03-18 08:13:55.000000000 +0100
++++ nautilus-2.18.3/libnautilus-private/nautilus-desktop-link-monitor.c	2007-07-18 23:35:33.964732922 +0200
 @@ -107,6 +107,8 @@
  	GnomeVFSVolume *volume;
  	char *dialog_str;
@@ -26,11 +26,11 @@
  			eel_run_simple_dialog
  				(parent_view, 
  				 FALSE,
-Index: nautilus-2.18.1/src/file-manager/fm-directory-view.c
+Index: nautilus-2.18.3/src/file-manager/fm-directory-view.c
 ===================================================================
---- nautilus-2.18.1.orig/src/file-manager/fm-directory-view.c	2007-04-26 00:31:03.625655750 +0200
-+++ nautilus-2.18.1/src/file-manager/fm-directory-view.c	2007-04-26 00:31:52.728724500 +0200
-@@ -7266,10 +7266,14 @@
+--- nautilus-2.18.3.orig/src/file-manager/fm-directory-view.c	2007-07-18 23:35:20.903988633 +0200
++++ nautilus-2.18.3/src/file-manager/fm-directory-view.c	2007-07-18 23:35:33.972733378 +0200
+@@ -7268,10 +7268,14 @@
  		*show_unmount = TRUE;
  
  		volume = nautilus_file_get_volume (file);
@@ -47,10 +47,10 @@
  		if (gnome_vfs_drive_is_mounted (drive)) {
  			*show_unmount = TRUE;
  		} else {
-Index: nautilus-2.18.1/src/file-manager/fm-tree-view.c
+Index: nautilus-2.18.3/src/file-manager/fm-tree-view.c
 ===================================================================
---- nautilus-2.18.1.orig/src/file-manager/fm-tree-view.c	2007-04-10 14:05:29.000000000 +0200
-+++ nautilus-2.18.1/src/file-manager/fm-tree-view.c	2007-04-26 00:31:52.728724500 +0200
+--- nautilus-2.18.3.orig/src/file-manager/fm-tree-view.c	2007-02-06 11:26:33.000000000 +0100
++++ nautilus-2.18.3/src/file-manager/fm-tree-view.c	2007-07-18 23:35:33.972733378 +0200
 @@ -804,8 +804,12 @@
  		
  		volume = fm_tree_model_get_volume_for_root_node_file (view->details->child_model, view->details->popup_file);

Modified: desktop/unstable/nautilus/debian/patches/14_sidebar_network-protocol.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/patches/14_sidebar_network-protocol.patch?rev=12015&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/patches/14_sidebar_network-protocol.patch (original)
+++ desktop/unstable/nautilus/debian/patches/14_sidebar_network-protocol.patch Wed Jul 18 22:10:30 2007
@@ -1,6 +1,8 @@
---- a/src/nautilus-places-sidebar.c	2006-04-15 13:19:44.000000000 -0300
-+++ b/src/nautilus-places-sidebar.c	2007-02-13 21:19:16.000000000 -0200
-@@ -254,6 +254,14 @@
+Index: nautilus-2.18.3/src/nautilus-places-sidebar.c
+===================================================================
+--- nautilus-2.18.3.orig/src/nautilus-places-sidebar.c	2007-07-18 23:35:17.891816979 +0200
++++ nautilus-2.18.3/src/nautilus-places-sidebar.c	2007-07-18 23:35:43.557279570 +0200
+@@ -315,6 +315,14 @@
  	}
  	g_list_free (drives);

More information about the pkg-gnome-commits mailing list