r36878 - in /desktop/experimental/gvfs/debian: ./ patches/

pochu at users.alioth.debian.org pochu at users.alioth.debian.org
Tue Mar 5 15:28:34 UTC 2013 

Author: pochu
Date: Tue Mar  5 15:28:34 2013
New Revision: 36878

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=36878
Log:
  + debian/patches/*:
    - Refreshed.

Modified:
    desktop/experimental/gvfs/debian/changelog
    desktop/experimental/gvfs/debian/patches/01_modules_dir.patch
    desktop/experimental/gvfs/debian/patches/05_shared_libdaemon.patch
    desktop/experimental/gvfs/debian/patches/06_metadata_nfs.patch
    desktop/experimental/gvfs/debian/patches/build_old_libgphoto.patch
    desktop/experimental/gvfs/debian/patches/handle-inactive-vfs.patch
    desktop/experimental/gvfs/debian/patches/metadata-dont-flush-null-tree.patch
    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=36878&op=diff
==============================================================================
--- desktop/experimental/gvfs/debian/changelog [utf-8] (original)
+++ desktop/experimental/gvfs/debian/changelog [utf-8] Tue Mar  5 15:28:34 2013
@@ -13,6 +13,8 @@
     + debian/control.in:
       - Update build dependencies.
       - Enable MTP support.
+    + debian/patches/*:
+      - Refreshed.
 
  -- Josselin Mouette <joss at debian.org>  Sat, 05 Jan 2013 12:09:20 +0100
 

Modified: desktop/experimental/gvfs/debian/patches/01_modules_dir.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gvfs/debian/patches/01_modules_dir.patch?rev=36878&op=diff
==============================================================================
--- desktop/experimental/gvfs/debian/patches/01_modules_dir.patch [utf-8] (original)
+++ desktop/experimental/gvfs/debian/patches/01_modules_dir.patch [utf-8] Tue Mar  5 15:28:34 2013
@@ -1,8 +1,6 @@
-Index: gvfs-1.10.1/configure.ac
-===================================================================
---- gvfs-1.10.1.orig/configure.ac	2011-10-17 14:40:15.018104293 +0200
-+++ gvfs-1.10.1/configure.ac	2011-11-13 11:13:26.339677537 +0100
-@@ -56,7 +56,7 @@ AC_ARG_WITH(dbus_service_dir,
+--- a/configure.ac
++++ b/configure.ac
+@@ -71,7 +71,7 @@
  DBUS_SERVICE_DIR=$with_dbus_service_dir
  AC_SUBST(DBUS_SERVICE_DIR)
  

Modified: desktop/experimental/gvfs/debian/patches/05_shared_libdaemon.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gvfs/debian/patches/05_shared_libdaemon.patch?rev=36878&op=diff
==============================================================================
--- desktop/experimental/gvfs/debian/patches/05_shared_libdaemon.patch [utf-8] (original)
+++ desktop/experimental/gvfs/debian/patches/05_shared_libdaemon.patch [utf-8] Tue Mar  5 15:28:34 2013
@@ -11,8 +11,6 @@
  daemon/Makefile.am |   14 +++++++++++---
  2 files changed, 15 insertions(+), 5 deletions(-)
 
-diff --git a/common/Makefile.am b/common/Makefile.am
-index 07ac8f4..5db22f9 100644
 --- a/common/Makefile.am
 +++ b/common/Makefile.am
 @@ -1,6 +1,8 @@
@@ -25,7 +23,7 @@
  noinst_LTLIBRARIES = libgvfscommon-monitor.la
  
  INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/gvfs \
-@@ -31,7 +33,7 @@ libgvfscommon_la_SOURCES = 	\
+@@ -31,7 +33,7 @@
  	$(NULL)
  
  # needed by cygwin (see bug #564003)
@@ -34,11 +32,9 @@
  
  libgvfscommon_la_LIBADD =	\
  	$(GLIB_LIBS)		\
-diff --git a/daemon/Makefile.am b/daemon/Makefile.am
-index 1cb0cba..5ae6d79 100644
 --- a/daemon/Makefile.am
 +++ b/daemon/Makefile.am
-@@ -18,10 +18,12 @@ INCLUDES =					\
+@@ -18,10 +18,12 @@
  	-DMOUNTABLE_DIR=\"$(mountdir)/\" 	\
  	-DGVFS_LOCALEDIR=\""$(localedir)"\"
  
@@ -53,7 +49,7 @@
  	$(top_builddir)/common/libgvfscommon.la		\
  	$(GLIB_LIBS) $(KEYRING_LIBS)
  
-@@ -138,7 +140,7 @@ noinst_PROGRAMS =				\
+@@ -149,7 +151,7 @@
  	gvfsd-test			\
  	$(NULL)
  
@@ -62,7 +58,7 @@
  	gvfsdaemon.c gvfsdaemon.h \
  	gvfsbackend.c gvfsbackend.h \
  	gvfschannel.c gvfschannel.h \
-@@ -186,6 +188,12 @@ libdaemon_la_SOURCES = \
+@@ -197,6 +199,12 @@
  	gvfskeyring.h gvfskeyring.c \
          $(NULL)
  
@@ -75,6 +71,3 @@
  gvfsd_SOURCES = \
  	mount.c mount.h \
  	main.c
--- 
-1.7.10.4
-

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=36878&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] Tue Mar  5 15:28:34 2013
@@ -1,7 +1,5 @@
-Index: gvfs-1.14.2/metadata/meta-daemon.c
-===================================================================
---- 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
+--- a/metadata/meta-daemon.c
++++ b/metadata/meta-daemon.c
 @@ -25,6 +25,7 @@
  #include <glib.h>
  #include <glib/gi18n.h>
@@ -10,7 +8,7 @@
  #include <locale.h>
  #include <stdlib.h>
  #include "metatree.h"
-@@ -431,6 +432,34 @@ on_name_lost (GDBusConnection *connectio
+@@ -431,6 +432,34 @@
  }
  
  
@@ -45,9 +43,9 @@
  int
  main (int argc, char *argv[])
  {
-@@ -481,6 +510,12 @@ main (int argc, char *argv[])
+@@ -479,6 +508,12 @@
  
-   g_type_init ();
+   g_option_context_free (context);
  
 +  if (home_is_remote ())
 +    {

Modified: desktop/experimental/gvfs/debian/patches/build_old_libgphoto.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gvfs/debian/patches/build_old_libgphoto.patch?rev=36878&op=diff
==============================================================================
--- desktop/experimental/gvfs/debian/patches/build_old_libgphoto.patch [utf-8] (original)
+++ desktop/experimental/gvfs/debian/patches/build_old_libgphoto.patch [utf-8] Tue Mar  5 15:28:34 2013
@@ -3,11 +3,9 @@
 Origin: vendor, Ubuntu
 Description: revert upstream patch for libgphoto 2.5 support it breaks build
 
-Index: gvfs/configure.ac
-===================================================================
---- gvfs.orig/configure.ac	2012-09-20 12:58:22.755879882 +0200
-+++ gvfs/configure.ac	2012-09-20 12:59:45.163883872 +0200
-@@ -436,10 +436,6 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -472,10 +472,6 @@
    if test "x$msg_gphoto2" = "xyes"; then
      if test "x$use_gphoto2" = "xyes"; then
        AC_DEFINE(HAVE_GPHOTO2, 1, [Define to 1 if gphoto2 is available])
@@ -18,10 +16,8 @@
      else
        if test "x$enable_gphoto2" = "xyes"; then
          AC_MSG_ERROR([Cannot build with gphoto2 support. Need OS tweaks in hal volume monitor.])
-Index: gvfs/daemon/gvfsbackendgphoto2.c
-===================================================================
---- gvfs.orig/daemon/gvfsbackendgphoto2.c	2012-09-20 12:58:22.755879882 +0200
-+++ gvfs/daemon/gvfsbackendgphoto2.c	2012-09-20 12:58:34.883880470 +0200
+--- a/daemon/gvfsbackendgphoto2.c
++++ b/daemon/gvfsbackendgphoto2.c
 @@ -1687,9 +1687,7 @@
        return;
      }
@@ -32,7 +28,7 @@
    
    /* set port */
    rc = gp_camera_set_port_info (gphoto2_backend->camera, info);
-@@ -2638,11 +2636,7 @@
+@@ -2633,11 +2631,7 @@
          }
      }
  
@@ -44,7 +40,7 @@
    if (rc != 0)
      goto out;
  
-@@ -3274,18 +3268,14 @@
+@@ -3269,18 +3263,14 @@
    if (rc != 0)
      goto out;
  

Modified: desktop/experimental/gvfs/debian/patches/handle-inactive-vfs.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gvfs/debian/patches/handle-inactive-vfs.patch?rev=36878&op=diff
==============================================================================
--- desktop/experimental/gvfs/debian/patches/handle-inactive-vfs.patch [utf-8] (original)
+++ desktop/experimental/gvfs/debian/patches/handle-inactive-vfs.patch [utf-8] Tue Mar  5 15:28:34 2013
@@ -2,11 +2,9 @@
 Origin: vendor, Ubuntu
 Bug-Ubuntu: LP #832533
 
-Index: gvfs/client/gdaemonvfs.c
-===================================================================
---- gvfs.orig/client/gdaemonvfs.c	2012-09-20 12:44:55.450666000 +0200
-+++ gvfs/client/gdaemonvfs.c	2012-09-20 12:49:43.447854749 +0200
-@@ -1479,7 +1479,7 @@
+--- a/client/gdaemonvfs.c
++++ b/client/gdaemonvfs.c
+@@ -1476,7 +1476,7 @@
  GDBusConnection *
  _g_daemon_vfs_get_async_bus (void)
  {

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=36878&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] Tue Mar  5 15:28:34 2013
@@ -9,10 +9,8 @@
  metadata/metatree.c |    5 ++++-
  1 files changed, 4 insertions(+), 1 deletions(-)
 
-Index: gvfs-1.12.0/metadata/metatree.c
-===================================================================
---- gvfs-1.12.0.orig/metadata/metatree.c	2012-03-26 10:35:11.000000000 -0400
-+++ gvfs-1.12.0/metadata/metatree.c	2012-04-11 11:22:44.483902765 -0400
+--- a/metadata/metatree.c
++++ b/metadata/metatree.c
 @@ -272,7 +272,7 @@
    if (tree->fd != -1)
      {
@@ -22,7 +20,7 @@
      }
  }
  
-@@ -2351,6 +2351,9 @@
+@@ -2355,6 +2355,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=36878&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] Tue Mar  5 15:28:34 2013
@@ -7,11 +7,9 @@
  metadata/metatree.c |   12 +++++++++++-
  1 files changed, 11 insertions(+), 1 deletions(-)
 
-Index: gvfs-1.12.0/metadata/metatree.c
-===================================================================
---- gvfs-1.12.0.orig/metadata/metatree.c	2012-04-11 11:22:44.483902765 -0400
-+++ gvfs-1.12.0/metadata/metatree.c	2012-04-11 11:22:59.619902925 -0400
-@@ -473,7 +473,17 @@
+--- a/metadata/metatree.c
++++ b/metadata/metatree.c
+@@ -477,7 +477,17 @@
    tree->header = (MetaFileHeader *)data;
  
    if (memcmp (tree->header->magic, MAGIC, MAGIC_LEN) != 0)

More information about the pkg-gnome-commits mailing list