r33507 - in /desktop/unstable/gvfs/debian: changelog patches/06_glib-single-include.patch patches/series

[biebl at users.alioth.debian.org]

Author: biebl
Date: Sun Mar 25 14:23:54 2012
New Revision: 33507

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=33507
Log:
debian/patches/06_glib-single-include.patch: Fix build failure with glib
2.32 where including individual glib headers is no longer supported.
Closes: #665553

Added:
    desktop/unstable/gvfs/debian/patches/06_glib-single-include.patch
Modified:
    desktop/unstable/gvfs/debian/changelog
    desktop/unstable/gvfs/debian/patches/series

Modified: desktop/unstable/gvfs/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gvfs/debian/changelog?rev=33507&op=diff
==============================================================================
--- desktop/unstable/gvfs/debian/changelog [utf-8] (original)
+++ desktop/unstable/gvfs/debian/changelog [utf-8] Sun Mar 25 14:23:54 2012
@@ -3,8 +3,11 @@
   * Bump Build-Depends on cdbs and debhelper for multiarch support.
   * Replace Depends on fuse-utils with fuse, as fuse-utils is now only a
     transitional package depending on fuse.
-
- -- Michael Biebl <biebl at debian.org>  Sun, 18 Mar 2012 15:38:43 +0100
+  * debian/patches/06_glib-single-include.patch: Fix build failure with glib
+    2.32 where including individual glib headers is no longer supported.
+    Closes: #665553
+
+ -- Michael Biebl <biebl at debian.org>  Sun, 25 Mar 2012 16:22:50 +0200
 
 gvfs (1.10.1-2) unstable; urgency=low
 

Added: desktop/unstable/gvfs/debian/patches/06_glib-single-include.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gvfs/debian/patches/06_glib-single-include.patch?rev=33507&op=file
==============================================================================
--- desktop/unstable/gvfs/debian/patches/06_glib-single-include.patch (added)
+++ desktop/unstable/gvfs/debian/patches/06_glib-single-include.patch [utf-8] Sun Mar 25 14:23:54 2012
@@ -1,0 +1,12 @@
+Index: gvfs-1.10.1/client/gvfsfusedaemon.c
+===================================================================
+--- gvfs-1.10.1.orig/client/gvfsfusedaemon.c	2011-10-17 14:48:18.364514085 +0200
++++ gvfs-1.10.1/client/gvfsfusedaemon.c	2012-03-25 16:21:13.862620175 +0200
+@@ -41,7 +41,6 @@
+ #include <glib/gprintf.h>
+ #include <gio/gio.h>
+ 
+-#include <glib/gurifuncs.h>
+ 
+ /* stuff from common/ */
+ #include <gdaemonmount.h>

Modified: desktop/unstable/gvfs/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gvfs/debian/patches/series?rev=33507&op=diff
==============================================================================
--- desktop/unstable/gvfs/debian/patches/series [utf-8] (original)
+++ desktop/unstable/gvfs/debian/patches/series [utf-8] Sun Mar 25 14:23:54 2012
@@ -3,3 +3,4 @@
 03_xdg-mount.patch
 04_hurd_path_max.patch
 05_shared_libdaemon.patch
+06_glib-single-include.patch