r44157 - in /desktop/experimental/gvfs/debian: changelog control patches/metadata-nuke-junk-data.patch

[laney at users.alioth.debian.org]

Author: laney
Date: Thu Mar 12 13:17:25 2015
New Revision: 44157

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=44157
Log:
New upstream release 1.23.90

Modified:
    desktop/experimental/gvfs/debian/changelog
    desktop/experimental/gvfs/debian/control
    desktop/experimental/gvfs/debian/patches/metadata-nuke-junk-data.patch

Modified: desktop/experimental/gvfs/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gvfs/debian/changelog?rev=44157&op=diff
==============================================================================
--- desktop/experimental/gvfs/debian/changelog	[utf-8] (original)
+++ desktop/experimental/gvfs/debian/changelog	[utf-8] Thu Mar 12 13:17:25 2015
@@ -1,3 +1,20 @@
+gvfs (1.23.90-1) UNRELEASED; urgency=medium
+
+  * New upstream release 1.23.90
+    - ftp: Implement backups for replace
+    - ftp: Implement G_FILE_COPY_NOFOLLOW_SYMLINKS
+    - programs: Fix bash completion
+    - dav: Add support for server-side copying
+    - mtp: Set MTP filetype from mime type when uploading files
+    - gvfs-mount: Allow mounting as an anonymous user
+    - smb: Handle the anonymous flag
+    - gproxymount: Fix crashes if eject callback isn't specified
+    - metadata: Fix crashes if tree initilization failed
+    - Fix reported size for http and dav
+  * debian/patches/metadata-nuke-junk-data.patch: Refresh.
+
+ -- Iain Lane <laney at debian.org>  Thu, 12 Mar 2015 11:50:27 +0000
+
 gvfs (1.23.2-1) experimental; urgency=medium
 
   * New upstream release 1.23.2

Modified: desktop/experimental/gvfs/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gvfs/debian/control?rev=44157&op=diff
==============================================================================
--- desktop/experimental/gvfs/debian/control	[utf-8] (original)
+++ desktop/experimental/gvfs/debian/control	[utf-8] Thu Mar 12 13:17:25 2015
@@ -6,7 +6,7 @@
 Section: gnome
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
-Uploaders: Andreas Henriksson <andreas at fatal.se>, Michael Biebl <biebl at debian.org>
+Uploaders: Andreas Henriksson <andreas at fatal.se>, Iain Lane <laney at debian.org>, Michael Biebl <biebl at debian.org>
 Build-Depends: debhelper (>= 8.1.3),
                autotools-dev,
                cdbs (>= 0.4.93),

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=44157&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] Thu Mar 12 13:17:25 2015
@@ -7,16 +7,15 @@
  metadata/metatree.c |   12 +++++++++++-
  1 files changed, 11 insertions(+), 1 deletions(-)
 
-Index: gvfs-1.22.1/metadata/metatree.c
+Index: b/metadata/metatree.c
 ===================================================================
---- gvfs-1.22.1.orig/metadata/metatree.c	2014-10-13 15:47:03.322285726 +0200
-+++ gvfs-1.22.1/metadata/metatree.c	2014-10-13 15:47:03.318285659 +0200
-@@ -418,7 +418,17 @@
-   tree->header = (MetaFileHeader *)data;
- 
+--- a/metadata/metatree.c
++++ b/metadata/metatree.c
+@@ -420,7 +420,15 @@
    if (memcmp (tree->header->magic, MAGIC, MAGIC_LEN) != 0)
--    goto err;
-+    {
+     {
+       g_warning ("can't init metadata tree %s: wrong magic", tree->filename);
+-      goto err;
 +      if (!tree->for_write)
 +        goto err;
 +
@@ -26,7 +25,6 @@
 +        goto err;
 +
 +      goto retry;
-+    }
+     }
  
    if (tree->header->major != MAJOR_VERSION)
-     goto err;