r12455 - in /desktop/experimental/gnome-vfs2/debian: changelog patches/24_gnome_vfs_home_dir.patch

slomo at users.alioth.debian.org slomo at users.alioth.debian.org
Mon Sep 10 09:08:03 UTC 2007 

Author: slomo
Date: Mon Sep 10 09:08:03 2007
New Revision: 12455

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=12455
Log:
* Merge 1:2.18.3-5:
  + debian/patches/24_gnome_vfs_home_dir.patch:
    - Include stdlib.h for getenv(). Otherwise it will segfault on amd64 at
      least. Thanks to Andreas Henriksson for debugging.
* Drop the linux-libc-dev build-dep altogether.
* debian/patches/24_gnome_vfs_home_dir.patch:
  + Include stdlib.h for getenv(). Otherwise it will segfault on amd64 at
    least. Thanks to Andreas Henriksson for debugging.

Modified:
    desktop/experimental/gnome-vfs2/debian/changelog
    desktop/experimental/gnome-vfs2/debian/patches/24_gnome_vfs_home_dir.patch

Modified: desktop/experimental/gnome-vfs2/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-vfs2/debian/changelog?rev=12455&op=diff
==============================================================================
--- desktop/experimental/gnome-vfs2/debian/changelog (original)
+++ desktop/experimental/gnome-vfs2/debian/changelog Mon Sep 10 09:08:03 2007
@@ -1,3 +1,12 @@
+gnome-vfs2 (1:2.19.91-2) unstable; urgency=low
+
+  * Merge 1:2.18.3-5:
+    + debian/patches/24_gnome_vfs_home_dir.patch:
+      - Include stdlib.h for getenv(). Otherwise it will segfault on amd64 at
+        least. Thanks to Andreas Henriksson for debugging.
+
+ -- Sebastian Dröge <slomo at debian.org>  Mon, 10 Sep 2007 11:07:04 +0200
+
 gnome-vfs2 (1:2.19.91-1) experimental; urgency=low
 
   * New upstream release - no ABI and API changes.
@@ -28,6 +37,18 @@
       when dbus isn't running.
 
  -- Marc 'HE' Brockschmidt <he at debian.org>  Fri, 03 Aug 2007 17:22:58 +0200
+
+gnome-vfs2 (1:2.18.1-5) unstable; urgency=low
+
+  [ Loic Minier ]
+  * Drop the linux-libc-dev build-dep altogether.
+
+  [ Sebastian Dröge ]
+  * debian/patches/24_gnome_vfs_home_dir.patch:
+    + Include stdlib.h for getenv(). Otherwise it will segfault on amd64 at
+      least. Thanks to Andreas Henriksson for debugging.
+
+ -- Sebastian Dröge <slomo at debian.org>  Mon, 10 Sep 2007 10:49:36 +0200
 
 gnome-vfs2 (1:2.18.1-4) unstable; urgency=low
 

Modified: desktop/experimental/gnome-vfs2/debian/patches/24_gnome_vfs_home_dir.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-vfs2/debian/patches/24_gnome_vfs_home_dir.patch?rev=12455&op=diff
==============================================================================
--- desktop/experimental/gnome-vfs2/debian/patches/24_gnome_vfs_home_dir.patch (original)
+++ desktop/experimental/gnome-vfs2/debian/patches/24_gnome_vfs_home_dir.patch Mon Sep 10 09:08:03 2007
@@ -1,6 +1,6 @@
-diff -Naur gnome-vfs2-2.19.91.old/libgnomevfs/gnome-vfs-application-registry.c gnome-vfs2-2.19.91/libgnomevfs/gnome-vfs-application-registry.c
---- gnome-vfs2-2.19.91.old/libgnomevfs/gnome-vfs-application-registry.c	2007-04-02 16:16:47.000000000 +0200
-+++ gnome-vfs2-2.19.91/libgnomevfs/gnome-vfs-application-registry.c	2007-09-07 14:56:12.000000000 +0200
+diff -Naur gnome-vfs2-2.18.1.old/libgnomevfs/gnome-vfs-application-registry.c gnome-vfs2-2.18.1/libgnomevfs/gnome-vfs-application-registry.c
+--- gnome-vfs2-2.18.1.old/libgnomevfs/gnome-vfs-application-registry.c	2007-04-10 14:03:59.000000000 +0200
++++ gnome-vfs2-2.18.1/libgnomevfs/gnome-vfs-application-registry.c	2007-09-10 10:44:24.000000000 +0200
 @@ -944,6 +944,8 @@
  static void
  gnome_vfs_application_registry_init (void)
@@ -24,10 +24,18 @@
  						      ".gnome",
  						      "application-info",
  						      NULL);
-diff -Naur gnome-vfs2-2.19.91.old/libgnomevfs/gnome-vfs-cancellable-ops.c gnome-vfs2-2.19.91/libgnomevfs/gnome-vfs-cancellable-ops.c
---- gnome-vfs2-2.19.91.old/libgnomevfs/gnome-vfs-cancellable-ops.c	2007-08-21 11:26:49.000000000 +0200
-+++ gnome-vfs2-2.19.91/libgnomevfs/gnome-vfs-cancellable-ops.c	2007-09-07 14:56:44.000000000 +0200
-@@ -298,8 +298,13 @@
+diff -Naur gnome-vfs2-2.18.1.old/libgnomevfs/gnome-vfs-cancellable-ops.c gnome-vfs2-2.18.1/libgnomevfs/gnome-vfs-cancellable-ops.c
+--- gnome-vfs2-2.18.1.old/libgnomevfs/gnome-vfs-cancellable-ops.c	2007-04-10 14:03:59.000000000 +0200
++++ gnome-vfs2-2.18.1/libgnomevfs/gnome-vfs-cancellable-ops.c	2007-09-10 10:44:58.000000000 +0200
+@@ -35,6 +35,7 @@
+ #include <glib/gmessages.h>
+ #include <glib/gutils.h>
+ #include <string.h>
++#include <stdlib.h>
+ 
+ GnomeVFSResult
+ gnome_vfs_open_uri_cancellable (GnomeVFSHandle **handle,
+@@ -298,8 +299,13 @@
  		gnome_vfs_uri_ref (near_uri);
  	} else {
  		char *text_uri;
@@ -42,9 +50,9 @@
  		g_assert (text_uri != NULL);
  		/* assume file: method and the home directory */
  		near_uri = gnome_vfs_uri_new (text_uri);
-diff -Naur gnome-vfs2-2.19.91.old/libgnomevfs/gnome-vfs-configuration.c gnome-vfs2-2.19.91/libgnomevfs/gnome-vfs-configuration.c
---- gnome-vfs2-2.19.91.old/libgnomevfs/gnome-vfs-configuration.c	2007-04-02 16:16:48.000000000 +0200
-+++ gnome-vfs2-2.19.91/libgnomevfs/gnome-vfs-configuration.c	2007-09-07 14:46:49.000000000 +0200
+diff -Naur gnome-vfs2-2.18.1.old/libgnomevfs/gnome-vfs-configuration.c gnome-vfs2-2.18.1/libgnomevfs/gnome-vfs-configuration.c
+--- gnome-vfs2-2.18.1.old/libgnomevfs/gnome-vfs-configuration.c	2007-04-10 14:03:59.000000000 +0200
++++ gnome-vfs2-2.18.1/libgnomevfs/gnome-vfs-configuration.c	2007-09-10 10:44:24.000000000 +0200
 @@ -507,7 +507,9 @@
  		install_path_list (environment_path);
  	}
@@ -56,10 +64,18 @@
  	if (home_dir != NULL) {
  		home_config = g_build_filename (home_dir,
  						".gnome2", "vfs", "modules",
-diff -Naur gnome-vfs2-2.19.91.old/libgnomevfs/gnome-vfs-init.c gnome-vfs2-2.19.91/libgnomevfs/gnome-vfs-init.c
---- gnome-vfs2-2.19.91.old/libgnomevfs/gnome-vfs-init.c	2007-04-02 16:16:48.000000000 +0200
-+++ gnome-vfs2-2.19.91/libgnomevfs/gnome-vfs-init.c	2007-09-07 14:57:47.000000000 +0200
-@@ -64,8 +64,13 @@
+diff -Naur gnome-vfs2-2.18.1.old/libgnomevfs/gnome-vfs-init.c gnome-vfs2-2.18.1/libgnomevfs/gnome-vfs-init.c
+--- gnome-vfs2-2.18.1.old/libgnomevfs/gnome-vfs-init.c	2007-04-10 14:03:59.000000000 +0200
++++ gnome-vfs2-2.18.1/libgnomevfs/gnome-vfs-init.c	2007-09-10 10:45:30.000000000 +0200
+@@ -53,6 +53,7 @@
+ #include <sys/stat.h>
+ #include <sys/types.h>
+ #include <signal.h>
++#include <stdlib.h>
+ 
+ static gboolean vfs_already_initialized = FALSE;
+ G_LOCK_DEFINE_STATIC (vfs_already_initialized);
+@@ -64,8 +65,13 @@
  {
  	gboolean retval = TRUE;
  	gchar *dirname;
@@ -74,9 +90,9 @@
  
  	if (!g_file_test (dirname, G_FILE_TEST_EXISTS)) {
  		if (g_mkdir (dirname, S_IRWXU) != 0) {
-diff -Naur gnome-vfs2-2.19.91.old/libgnomevfs/gnome-vfs-utils.c gnome-vfs2-2.19.91/libgnomevfs/gnome-vfs-utils.c
---- gnome-vfs2-2.19.91.old/libgnomevfs/gnome-vfs-utils.c	2007-04-02 16:16:48.000000000 +0200
-+++ gnome-vfs2-2.19.91/libgnomevfs/gnome-vfs-utils.c	2007-09-07 14:59:01.000000000 +0200
+diff -Naur gnome-vfs2-2.18.1.old/libgnomevfs/gnome-vfs-utils.c gnome-vfs2-2.18.1/libgnomevfs/gnome-vfs-utils.c
+--- gnome-vfs2-2.18.1.old/libgnomevfs/gnome-vfs-utils.c	2007-04-10 14:03:59.000000000 +0200
++++ gnome-vfs2-2.18.1/libgnomevfs/gnome-vfs-utils.c	2007-09-10 10:44:24.000000000 +0200
 @@ -417,6 +417,7 @@
  #ifndef G_OS_WIN32
  	char *slash_after_user_name, *user_name;
@@ -114,9 +130,9 @@
  		
  			if (g_file_test (path, G_FILE_TEST_EXISTS)) {
  				uri = gnome_vfs_make_uri_from_input (path);
-diff -Naur gnome-vfs2-2.19.91.old/modules/computer-method.c gnome-vfs2-2.19.91/modules/computer-method.c
---- gnome-vfs2-2.19.91.old/modules/computer-method.c	2007-04-02 16:16:44.000000000 +0200
-+++ gnome-vfs2-2.19.91/modules/computer-method.c	2007-09-07 14:59:16.000000000 +0200
+diff -Naur gnome-vfs2-2.18.1.old/modules/computer-method.c gnome-vfs2-2.18.1/modules/computer-method.c
+--- gnome-vfs2-2.18.1.old/modules/computer-method.c	2007-04-10 14:03:56.000000000 +0200
++++ gnome-vfs2-2.18.1/modules/computer-method.c	2007-09-10 10:44:24.000000000 +0200
 @@ -550,8 +550,13 @@
  {
  	char *data;
@@ -132,9 +148,9 @@
  	data = g_strdup_printf ("[Desktop Entry]\n"
  				"Encoding=UTF-8\n"
  				"Name=%s\n"
-diff -Naur gnome-vfs2-2.19.91.old/modules/file-method.c gnome-vfs2-2.19.91/modules/file-method.c
---- gnome-vfs2-2.19.91.old/modules/file-method.c	2007-04-02 16:16:44.000000000 +0200
-+++ gnome-vfs2-2.19.91/modules/file-method.c	2007-09-07 15:00:31.000000000 +0200
+diff -Naur gnome-vfs2-2.18.1.old/modules/file-method.c gnome-vfs2-2.18.1/modules/file-method.c
+--- gnome-vfs2-2.18.1.old/modules/file-method.c	2007-04-10 14:03:56.000000000 +0200
++++ gnome-vfs2-2.18.1/modules/file-method.c	2007-09-10 10:44:24.000000000 +0200
 @@ -1529,8 +1529,13 @@
  	char *cache_file_parent, *cache_file_path;
  	GList *p;
@@ -182,10 +198,18 @@
  
  	if (gnome_vfs_context_check_cancellation (context)) {
  		g_free (full_name_near);
-diff -Naur gnome-vfs2-2.19.91.old/modules/smb-method.c gnome-vfs2-2.19.91/modules/smb-method.c
---- gnome-vfs2-2.19.91.old/modules/smb-method.c	2007-08-21 11:27:08.000000000 +0200
-+++ gnome-vfs2-2.19.91/modules/smb-method.c	2007-09-07 15:00:46.000000000 +0200
-@@ -659,6 +659,7 @@
+diff -Naur gnome-vfs2-2.18.1.old/modules/smb-method.c gnome-vfs2-2.18.1/modules/smb-method.c
+--- gnome-vfs2-2.18.1.old/modules/smb-method.c	2007-04-10 14:03:56.000000000 +0200
++++ gnome-vfs2-2.18.1/modules/smb-method.c	2007-09-10 10:46:06.000000000 +0200
+@@ -37,6 +37,7 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <unistd.h>
++#include <stdlib.h>
+ 
+ #include <gconf/gconf-client.h>
+ #include <libgnomevfs/gnome-vfs.h>
+@@ -646,6 +647,7 @@
  	GConfClient *gclient;
  	gchar *workgroup;
  	struct stat statbuf;
@@ -193,7 +217,7 @@
  
  	LOCK_SMB();
  
-@@ -666,7 +667,11 @@
+@@ -653,7 +655,11 @@
  	 * default settings, but this breaks a lot of smb.conf
  	 * configurations, so we remove this again. If you really
  	 * need an empty smb.conf, put a newline in it */
@@ -206,9 +230,9 @@
  			".smb", "smb.conf", NULL);
  
  	if (stat (path, &statbuf) == 0) {
-diff -Naur gnome-vfs2-2.19.91.old/test/test-async-cancel.c gnome-vfs2-2.19.91/test/test-async-cancel.c
---- gnome-vfs2-2.19.91.old/test/test-async-cancel.c	2007-04-02 16:16:53.000000000 +0200
-+++ gnome-vfs2-2.19.91/test/test-async-cancel.c	2007-09-07 15:01:16.000000000 +0200
+diff -Naur gnome-vfs2-2.18.1.old/test/test-async-cancel.c gnome-vfs2-2.18.1/test/test-async-cancel.c
+--- gnome-vfs2-2.18.1.old/test/test-async-cancel.c	2007-04-10 14:04:05.000000000 +0200
++++ gnome-vfs2-2.18.1/test/test-async-cancel.c	2007-09-10 10:44:24.000000000 +0200
 @@ -644,6 +644,11 @@
  {
  	GnomeVFSAsyncHandle *handle;

More information about the pkg-gnome-commits mailing list