r36617 - in /desktop/experimental/gvfs: ./ debian/changelog debian/patches/06_metadata_nfs.patch debian/patches/series

[joss at users.alioth.debian.org]

Author: joss
Date: Tue Feb  5 15:03:15 2013
New Revision: 36617

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=36617
Log:
06_metadata_nfs.patch: new patch. Disable gvfsd-metadata entirely on 
remote filesystems. It is better to miss functionality than to 
hammer the server. Closes: #624507.

Added:
    desktop/experimental/gvfs/debian/patches/06_metadata_nfs.patch
      - copied, changed from r36615, desktop/unstable/gvfs/debian/patches/06_metadata_nfs.patch
Modified:
    desktop/experimental/gvfs/   (props changed)
    desktop/experimental/gvfs/debian/changelog
    desktop/experimental/gvfs/debian/patches/series

Propchange: desktop/experimental/gvfs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb  5 15:03:15 2013
@@ -1,1 +1,1 @@
-/desktop/unstable/gvfs:26061,36533
+/desktop/unstable/gvfs:26061,36533,36614-36615

Modified: desktop/experimental/gvfs/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gvfs/debian/changelog?rev=36617&op=diff
==============================================================================
--- desktop/experimental/gvfs/debian/changelog [utf-8] (original)
+++ desktop/experimental/gvfs/debian/changelog [utf-8] Tue Feb  5 15:03:15 2013
@@ -3,6 +3,9 @@
   * New upstream release.
   * Add dependency on desktop-file-utils since many operations won’t 
     work without mimeinfo.cache.
+  * 06_metadata_nfs.patch: new patch. Disable gvfsd-metadata entirely on 
+    remote filesystems. It is better to miss functionality than to 
+    hammer the server. Closes: #624507.
 
  -- Josselin Mouette <joss at debian.org>  Sat, 05 Jan 2013 12:09:20 +0100
 

Copied: desktop/experimental/gvfs/debian/patches/06_metadata_nfs.patch (from r36615, desktop/unstable/gvfs/debian/patches/06_metadata_nfs.patch)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gvfs/debian/patches/06_metadata_nfs.patch?rev=36617&op=diff
==============================================================================
--- desktop/unstable/gvfs/debian/patches/06_metadata_nfs.patch [utf-8] (original)
+++ desktop/experimental/gvfs/debian/patches/06_metadata_nfs.patch [utf-8] Tue Feb  5 15:03:15 2013
@@ -1,7 +1,7 @@
-Index: gvfs-1.12.3/metadata/meta-daemon.c
+Index: gvfs-1.14.2/metadata/meta-daemon.c
 ===================================================================
---- gvfs-1.12.3.orig/metadata/meta-daemon.c	2013-02-05 15:27:50.107139266 +0100
-+++ gvfs-1.12.3/metadata/meta-daemon.c	2013-02-05 15:29:47.563713526 +0100
+--- gvfs-1.14.2.orig/metadata/meta-daemon.c	2013-02-05 16:02:45.473382989 +0100
++++ gvfs-1.14.2/metadata/meta-daemon.c	2013-02-05 16:02:45.465382960 +0100
 @@ -25,6 +25,7 @@
  #include <glib.h>
  #include <glib/gi18n.h>
@@ -9,10 +9,10 @@
 +#include <gio/gio.h>
  #include <locale.h>
  #include <stdlib.h>
- #include <dbus/dbus.h>
-@@ -681,6 +682,34 @@ static struct DBusObjectPathVTable metad
-   metadata_message
- };
+ #include "metatree.h"
+@@ -431,6 +432,34 @@ on_name_lost (GDBusConnection *connectio
+ }
+ 
  
 +static gboolean
 +home_is_remote (void)
@@ -45,7 +45,7 @@
  int
  main (int argc, char *argv[])
  {
-@@ -729,6 +758,12 @@ main (int argc, char *argv[])
+@@ -481,6 +510,12 @@ main (int argc, char *argv[])
  
    g_type_init ();
  
@@ -57,4 +57,4 @@
 +
    loop = g_main_loop_new (NULL, FALSE);
  
-   dbus_error_init (&derror);
+   error = NULL;

Modified: desktop/experimental/gvfs/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gvfs/debian/patches/series?rev=36617&op=diff
==============================================================================
--- desktop/experimental/gvfs/debian/patches/series [utf-8] (original)
+++ desktop/experimental/gvfs/debian/patches/series [utf-8] Tue Feb  5 15:03:15 2013
@@ -2,6 +2,7 @@
 03_xdg-mount.patch
 04_hurd_path_max.patch
 05_shared_libdaemon.patch
+06_metadata_nfs.patch
 metadata-dont-flush-null-tree.patch
 metadata-nuke-junk-data.patch
 dont-crash-on-null-job.patch