r33447 - in /desktop/experimental/gvfs/debian: changelog patches/02_deprecated.patch patches/05_shared_libdaemon.patch patches/series

[mpitt at users.alioth.debian.org]

Author: mpitt
Date: Wed Mar 21 08:04:38 2012
New Revision: 33447

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=33447
Log:
* New upstream release:
  - fuse: Keep using ~/.gvfs as fallback (LP: #945399)
* Drop 02_deprecated.patch: Fixed upstream.

Removed:
    desktop/experimental/gvfs/debian/patches/02_deprecated.patch
Modified:
    desktop/experimental/gvfs/debian/changelog
    desktop/experimental/gvfs/debian/patches/05_shared_libdaemon.patch
    desktop/experimental/gvfs/debian/patches/series

Modified: desktop/experimental/gvfs/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gvfs/debian/changelog?rev=33447&op=diff
==============================================================================
--- desktop/experimental/gvfs/debian/changelog [utf-8] (original)
+++ desktop/experimental/gvfs/debian/changelog [utf-8] Wed Mar 21 08:04:38 2012
@@ -1,4 +1,4 @@
-gvfs (1.10.1-3) UNRELEASED; urgency=low
+gvfs (1.11.5-1) UNRELEASED; urgency=low
 
   [ Michael Biebl ]
   * Bump Build-Depends on cdbs and debhelper for multiarch support.
@@ -7,6 +7,9 @@
 
   [ Martin Pitt ]
   * debian/watch: Watch for development versions in experimental.
+  * New upstream release:
+    - fuse: Keep using ~/.gvfs as fallback (LP: #945399)
+  * Drop 02_deprecated.patch: Fixed upstream.
 
  -- Michael Biebl <biebl at debian.org>  Sun, 18 Mar 2012 15:38:43 +0100
 

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=33447&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] Wed Mar 21 08:04:38 2012
@@ -1,10 +1,10 @@
-Index: gvfs-1.10.1/daemon/Makefile.am
+Index: gvfs-exp/daemon/Makefile.am
 ===================================================================
---- gvfs-1.10.1.orig/daemon/Makefile.am	2011-11-13 09:41:56.004836632 +0100
-+++ gvfs-1.10.1/daemon/Makefile.am	2011-11-13 09:42:19.372950874 +0100
-@@ -19,12 +19,14 @@ INCLUDES =					\
- 	-DGVFS_LOCALEDIR=\""$(localedir)"\"     \
- 	$(NULL)
+--- gvfs-exp.orig/daemon/Makefile.am	2012-03-19 17:18:57.000000000 +0100
++++ gvfs-exp/daemon/Makefile.am	2012-03-21 09:01:10.620172442 +0100
+@@ -18,12 +18,14 @@
+ 	-DMOUNTABLE_DIR=\"$(mountdir)/\" 	\
+ 	-DGVFS_LOCALEDIR=\""$(localedir)"\"
  
 -noinst_LTLIBRARIES=libdaemon.la
 +privlibdir = $(libdir)/gvfs
@@ -20,7 +20,7 @@
  
  gvfs_gschemas =
  gvfs_gschemas_convert =
-@@ -133,7 +135,7 @@ noinst_PROGRAMS =				\
+@@ -132,7 +134,7 @@
  	gvfsd-test			\
  	$(NULL)
  
@@ -29,7 +29,7 @@
  	gvfsdaemon.c gvfsdaemon.h \
  	gvfsbackend.c gvfsbackend.h \
  	gvfschannel.c gvfschannel.h \
-@@ -181,6 +183,12 @@ libdaemon_la_SOURCES = \
+@@ -180,6 +182,12 @@
  	gvfskeyring.h gvfskeyring.c \
          $(NULL)
  
@@ -42,10 +42,10 @@
  gvfsd_SOURCES = \
  	mount.c mount.h \
  	main.c
-Index: gvfs-1.10.1/common/Makefile.am
+Index: gvfs-exp/common/Makefile.am
 ===================================================================
---- gvfs-1.10.1.orig/common/Makefile.am	2011-11-13 09:41:56.004836632 +0100
-+++ gvfs-1.10.1/common/Makefile.am	2011-11-13 09:42:19.372950874 +0100
+--- gvfs-exp.orig/common/Makefile.am	2012-03-19 17:18:57.000000000 +0100
++++ gvfs-exp/common/Makefile.am	2012-03-21 09:01:10.620172442 +0100
 @@ -1,6 +1,8 @@
  NULL =
  
@@ -56,7 +56,7 @@
  
  INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/gvfs \
  	-I$(top_srcdir)/daemon \
-@@ -22,7 +24,7 @@ libgvfscommon_la_SOURCES = 	\
+@@ -22,7 +24,7 @@
  	$(NULL)
  
  # needed by cygwin (see bug #564003)
@@ -65,7 +65,7 @@
  
  libgvfscommon_la_LIBADD =	\
  	$(DBUS_LIBS) 		\
-@@ -30,7 +32,7 @@ libgvfscommon_la_LIBADD =	\
+@@ -30,7 +32,7 @@
  	$(BLURAY_LIBS)
  
  if HAVE_AVAHI
@@ -74,7 +74,7 @@
  
  libgvfscommon_dnssd_la_SOURCES = 	\
  	gvfsdnssdutils.c gvfsdnssdutils.h \
-@@ -40,6 +42,8 @@ libgvfscommon_dnssd_la_SOURCES = 	\
+@@ -40,6 +42,8 @@
  libgvfscommon_dnssd_la_CFLAGS =	\
  	$(AVAHI_CFLAGS)
  

Modified: desktop/experimental/gvfs/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gvfs/debian/patches/series?rev=33447&op=diff
==============================================================================
--- desktop/experimental/gvfs/debian/patches/series [utf-8] (original)
+++ desktop/experimental/gvfs/debian/patches/series [utf-8] Wed Mar 21 08:04:38 2012
@@ -1,5 +1,4 @@
 01_modules_dir.patch
-02_deprecated.patch
 03_xdg-mount.patch
 04_hurd_path_max.patch
 05_shared_libdaemon.patch