r37895 - in /desktop/experimental/gvfs/debian: changelog patches/06_metadata_nfs.patch patches/dont-crash-on-null-job.patch patches/metadata-dont-flush-null-tree.patch patches/metadata-nuke-junk-data.patch patches/ref-jobs-in-thread.patch

ah at users.alioth.debian.org ah at users.alioth.debian.org
Fri May 24 15:55:56 UTC 2013 

Author: ah
Date: Fri May 24 15:55:55 2013
New Revision: 37895

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=37895
Log:
* New upstream release.
* Refresh patches to apply cleanly:
  - debian/patches/06_metadata_nfs.patch
  - debian/patches/dont-crash-on-null-job.patch
  - debian/patches/metadata-dont-flush-null-tree.patch
  - debian/patches/metadata-nuke-junk-data.patch
  - debian/patches/ref-jobs-in-thread.patch

Modified:
    desktop/experimental/gvfs/debian/changelog
    desktop/experimental/gvfs/debian/patches/06_metadata_nfs.patch
    desktop/experimental/gvfs/debian/patches/dont-crash-on-null-job.patch
    desktop/experimental/gvfs/debian/patches/metadata-dont-flush-null-tree.patch
    desktop/experimental/gvfs/debian/patches/metadata-nuke-junk-data.patch
    desktop/experimental/gvfs/debian/patches/ref-jobs-in-thread.patch

Modified: desktop/experimental/gvfs/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gvfs/debian/changelog?rev=37895&op=diff
==============================================================================
--- desktop/experimental/gvfs/debian/changelog [utf-8] (original)
+++ desktop/experimental/gvfs/debian/changelog [utf-8] Fri May 24 15:55:55 2013
@@ -1,9 +1,19 @@
-gvfs (1.16.0-2) UNRELEASED; urgency=low
-
+gvfs (1.16.2-1) experimental; urgency=low
+
+  [ Martin Pitt ]
   * Enable gnome-online-accounts volume monitor. Add libgoa-1.0-dev build
     dependency for this.
 
- -- Martin Pitt <mpitt at debian.org>  Wed, 27 Mar 2013 07:34:51 +0100
+  [ Andreas Henriksson ]
+  * New upstream release.
+  * Refresh patches to apply cleanly:
+    - debian/patches/06_metadata_nfs.patch
+    - debian/patches/dont-crash-on-null-job.patch
+    - debian/patches/metadata-dont-flush-null-tree.patch
+    - debian/patches/metadata-nuke-junk-data.patch
+    - debian/patches/ref-jobs-in-thread.patch
+
+ -- Andreas Henriksson <andreas at fatal.se>  Fri, 24 May 2013 17:37:49 +0200
 
 gvfs (1.16.0-1) experimental; urgency=low
 

Modified: desktop/experimental/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=37895&op=diff
==============================================================================
--- desktop/experimental/gvfs/debian/patches/06_metadata_nfs.patch [utf-8] (original)
+++ desktop/experimental/gvfs/debian/patches/06_metadata_nfs.patch [utf-8] Fri May 24 15:55:55 2013
@@ -8,9 +8,9 @@
  #include <locale.h>
  #include <stdlib.h>
  #include "metatree.h"
-@@ -431,6 +432,34 @@
+@@ -468,6 +469,34 @@
+   g_main_loop_quit (loop);
  }
- 
  
 +static gboolean
 +home_is_remote (void)
@@ -43,7 +43,7 @@
  int
  main (int argc, char *argv[])
  {
-@@ -479,6 +508,12 @@
+@@ -516,6 +545,12 @@
  
    g_option_context_free (context);
  

Modified: desktop/experimental/gvfs/debian/patches/dont-crash-on-null-job.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gvfs/debian/patches/dont-crash-on-null-job.patch?rev=37895&op=diff
==============================================================================
--- desktop/experimental/gvfs/debian/patches/dont-crash-on-null-job.patch [utf-8] (original)
+++ desktop/experimental/gvfs/debian/patches/dont-crash-on-null-job.patch [utf-8] Fri May 24 15:55:55 2013
@@ -2,11 +2,9 @@
 Origin: vendor, Ubuntu
 Bug-Ubuntu: LP #345754, #838464
 
-Index: gvfs-1.12.0/daemon/gvfschannel.c
-===================================================================
---- gvfs-1.12.0.orig/daemon/gvfschannel.c	2012-04-11 16:56:44.000000000 -0400
-+++ gvfs-1.12.0/daemon/gvfschannel.c	2012-04-12 13:12:35.621018364 -0400
-@@ -610,7 +610,8 @@
+--- a/daemon/gvfschannel.c
++++ b/daemon/gvfschannel.c
+@@ -608,7 +608,8 @@
  
    job = channel->priv->current_job;
    channel->priv->current_job = NULL;
@@ -16,7 +14,7 @@
  
    class = G_VFS_CHANNEL_GET_CLASS (channel);
    
-@@ -631,7 +632,7 @@
+@@ -629,7 +630,7 @@
      }
    /* Start queued request or readahead */
    else if (!start_queued_request (channel) &&

Modified: desktop/experimental/gvfs/debian/patches/metadata-dont-flush-null-tree.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gvfs/debian/patches/metadata-dont-flush-null-tree.patch?rev=37895&op=diff
==============================================================================
--- desktop/experimental/gvfs/debian/patches/metadata-dont-flush-null-tree.patch [utf-8] (original)
+++ desktop/experimental/gvfs/debian/patches/metadata-dont-flush-null-tree.patch [utf-8] Fri May 24 15:55:55 2013
@@ -11,7 +11,7 @@
 
 --- a/metadata/metatree.c
 +++ b/metadata/metatree.c
-@@ -272,7 +272,7 @@
+@@ -236,7 +236,7 @@
    if (tree->fd != -1)
      {
        close (tree->fd);
@@ -20,7 +20,7 @@
      }
  }
  
-@@ -2355,6 +2355,9 @@
+@@ -2285,6 +2285,9 @@
  
    builder = meta_builder_new ();
  

Modified: desktop/experimental/gvfs/debian/patches/metadata-nuke-junk-data.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gvfs/debian/patches/metadata-nuke-junk-data.patch?rev=37895&op=diff
==============================================================================
--- desktop/experimental/gvfs/debian/patches/metadata-nuke-junk-data.patch [utf-8] (original)
+++ desktop/experimental/gvfs/debian/patches/metadata-nuke-junk-data.patch [utf-8] Fri May 24 15:55:55 2013
@@ -9,7 +9,7 @@
 
 --- a/metadata/metatree.c
 +++ b/metadata/metatree.c
-@@ -477,7 +477,17 @@
+@@ -397,7 +397,17 @@
    tree->header = (MetaFileHeader *)data;
  
    if (memcmp (tree->header->magic, MAGIC, MAGIC_LEN) != 0)

Modified: desktop/experimental/gvfs/debian/patches/ref-jobs-in-thread.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gvfs/debian/patches/ref-jobs-in-thread.patch?rev=37895&op=diff
==============================================================================
--- desktop/experimental/gvfs/debian/patches/ref-jobs-in-thread.patch [utf-8] (original)
+++ desktop/experimental/gvfs/debian/patches/ref-jobs-in-thread.patch [utf-8] Fri May 24 15:55:55 2013
@@ -1,10 +1,8 @@
 Description: make sure to keep a ref to jobs while they run in a thread
 Origin: vendor, Ubuntu
 
-Index: gvfs-1.13.4/daemon/gvfsdaemon.c
-===================================================================
---- gvfs-1.13.4.orig/daemon/gvfsdaemon.c	2012-07-31 17:12:28.000000000 +0200
-+++ gvfs-1.13.4/daemon/gvfsdaemon.c	2012-08-02 10:10:13.133604023 +0200
+--- a/daemon/gvfsdaemon.c
++++ b/daemon/gvfsdaemon.c
 @@ -182,6 +182,7 @@
    GVfsJob *job = G_VFS_JOB (data);
  
@@ -33,11 +31,9 @@
  }
  
  void
-Index: gvfs-1.13.4/daemon/gvfschannel.c
-===================================================================
---- gvfs-1.13.4.orig/daemon/gvfschannel.c	2012-08-02 10:10:09.797604049 +0200
-+++ gvfs-1.13.4/daemon/gvfschannel.c	2012-08-02 10:10:13.133604023 +0200
-@@ -642,6 +642,7 @@
+--- a/daemon/gvfschannel.c
++++ b/daemon/gvfschannel.c
+@@ -640,6 +640,7 @@
      }
  
    g_object_unref (job);
@@ -45,7 +41,7 @@
  }
  
  /* Might be called on an i/o thread */
-@@ -665,7 +666,7 @@
+@@ -663,7 +664,7 @@
  				   channel->priv->reply_buffer,
  				   G_VFS_DAEMON_SOCKET_PROTOCOL_REPLY_SIZE,
  				   0, NULL,
@@ -54,7 +50,7 @@
      }
    else
      {
-@@ -674,7 +675,7 @@
+@@ -672,7 +673,7 @@
  				   channel->priv->output_data,
  				   channel->priv->output_data_size,
  				   0, NULL,

More information about the pkg-gnome-commits mailing list