r13064 - in /desktop/unstable/gnome-vfs2/debian: changelog patches/24_home_dir_fakeroot.patch

[joss at users.alioth.debian.org]

Author: joss
Date: Thu Oct 11 08:16:10 2007
New Revision: 13064

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=13064
Log:
* 24_home_dir_fakeroot.patch: fix implicit conversion of pointer to 
  int. Closes: #446032. (I wonder how this could even work on amd64.)

Modified:
    desktop/unstable/gnome-vfs2/debian/changelog
    desktop/unstable/gnome-vfs2/debian/patches/24_home_dir_fakeroot.patch

Modified: desktop/unstable/gnome-vfs2/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-vfs2/debian/changelog?rev=13064&op=diff
==============================================================================
--- desktop/unstable/gnome-vfs2/debian/changelog (original)
+++ desktop/unstable/gnome-vfs2/debian/changelog Thu Oct 11 08:16:10 2007
@@ -1,3 +1,10 @@
+gnome-vfs (1:2.20.0-3) unstable; urgency=low
+
+  * 24_home_dir_fakeroot.patch: fix implicit conversion of pointer to 
+    int. Closes: #446032. (I wonder how this could even work on amd64.)
+
+ -- Josselin Mouette <joss at debian.org>  Thu, 11 Oct 2007 10:15:28 +0200
+
 gnome-vfs (1:2.20.0-2) unstable; urgency=low
 
   [ Josselin Mouette ]

Modified: desktop/unstable/gnome-vfs2/debian/patches/24_home_dir_fakeroot.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-vfs2/debian/patches/24_home_dir_fakeroot.patch?rev=13064&op=diff
==============================================================================
--- desktop/unstable/gnome-vfs2/debian/patches/24_home_dir_fakeroot.patch (original)
+++ desktop/unstable/gnome-vfs2/debian/patches/24_home_dir_fakeroot.patch Thu Oct 11 08:16:10 2007
@@ -1,7 +1,7 @@
 Index: gnome-vfs-2.20.0/libgnomevfs/gnome-vfs-application-registry.c
 ===================================================================
---- gnome-vfs-2.20.0.orig/libgnomevfs/gnome-vfs-application-registry.c	2007-10-06 12:01:42.746725988 +0200
-+++ gnome-vfs-2.20.0/libgnomevfs/gnome-vfs-application-registry.c	2007-10-06 17:02:20.298627491 +0200
+--- gnome-vfs-2.20.0.orig/libgnomevfs/gnome-vfs-application-registry.c	2007-01-03 07:50:44.000000000 +0100
++++ gnome-vfs-2.20.0/libgnomevfs/gnome-vfs-application-registry.c	2007-10-11 10:13:16.429551115 +0200
 @@ -965,7 +965,7 @@
  						       NULL);
  	gnome_registry_dir.system_dir = TRUE;
@@ -13,8 +13,8 @@
  						      NULL);
 Index: gnome-vfs-2.20.0/libgnomevfs/gnome-vfs-init.c
 ===================================================================
---- gnome-vfs-2.20.0.orig/libgnomevfs/gnome-vfs-init.c	2007-10-06 11:25:05.997540386 +0200
-+++ gnome-vfs-2.20.0/libgnomevfs/gnome-vfs-init.c	2007-10-06 17:02:48.224218879 +0200
+--- gnome-vfs-2.20.0.orig/libgnomevfs/gnome-vfs-init.c	2007-03-05 10:05:05.000000000 +0100
++++ gnome-vfs-2.20.0/libgnomevfs/gnome-vfs-init.c	2007-10-11 10:13:16.429551115 +0200
 @@ -59,29 +59,6 @@
  
  static GPrivate * private_is_primary_thread;
@@ -57,14 +57,14 @@
  
 Index: gnome-vfs-2.20.0/libgnomevfs/gnome-vfs-private-utils.c
 ===================================================================
---- gnome-vfs-2.20.0.orig/libgnomevfs/gnome-vfs-private-utils.c	2007-10-06 11:25:16.930163401 +0200
-+++ gnome-vfs-2.20.0/libgnomevfs/gnome-vfs-private-utils.c	2007-10-06 17:03:32.626749235 +0200
+--- gnome-vfs-2.20.0.orig/libgnomevfs/gnome-vfs-private-utils.c	2007-01-03 07:50:44.000000000 +0100
++++ gnome-vfs-2.20.0/libgnomevfs/gnome-vfs-private-utils.c	2007-10-11 10:14:48.814815851 +0200
 @@ -1086,3 +1086,54 @@
  }
  #endif
  
 +static gboolean
-+ensure_dot_gnome_exists (home_dir)
++ensure_dot_gnome_exists (gchar *home_dir)
 +{
 +	gboolean retval = TRUE;
 +	gchar *dirname;
@@ -116,8 +116,8 @@
 +}
 Index: gnome-vfs-2.20.0/libgnomevfs/gnome-vfs-private-utils.h
 ===================================================================
---- gnome-vfs-2.20.0.orig/libgnomevfs/gnome-vfs-private-utils.h	2007-10-06 11:25:16.958164997 +0200
-+++ gnome-vfs-2.20.0/libgnomevfs/gnome-vfs-private-utils.h	2007-10-06 17:00:55.753809556 +0200
+--- gnome-vfs-2.20.0.orig/libgnomevfs/gnome-vfs-private-utils.h	2007-01-03 07:50:44.000000000 +0100
++++ gnome-vfs-2.20.0/libgnomevfs/gnome-vfs-private-utils.h	2007-10-11 10:13:16.433551342 +0200
 @@ -124,6 +124,8 @@
  
  #endif
@@ -129,8 +129,8 @@
  #endif /* _GNOME_VFS_PRIVATE_UTILS_H */
 Index: gnome-vfs-2.20.0/modules/file-method.c
 ===================================================================
---- gnome-vfs-2.20.0.orig/modules/file-method.c	2007-10-06 12:06:41.527752548 +0200
-+++ gnome-vfs-2.20.0/modules/file-method.c	2007-10-06 17:01:44.860607993 +0200
+--- gnome-vfs-2.20.0.orig/modules/file-method.c	2007-10-11 10:13:16.345546327 +0200
++++ gnome-vfs-2.20.0/modules/file-method.c	2007-10-11 10:13:16.433551342 +0200
 @@ -1536,7 +1536,7 @@
  	GList *p;
  	char *buffer, *escaped_path, *escaped_mount_point;