[maemo-commits] [maemo-commits] r8574 - in projects/haf/branches/osso-gnome-vfs2/2-16-upstream-merge/debian: . patches

[From: subversion at stage.maemo.org]

Author: richard
Date: 2006-12-04 12:26:56 +0200 (Mon, 04 Dec 2006)
New Revision: 8574

Added:
   projects/haf/branches/osso-gnome-vfs2/2-16-upstream-merge/debian/patches/26-daemon-close-failed.patch
Modified:
   projects/haf/branches/osso-gnome-vfs2/2-16-upstream-merge/debian/changelog
   projects/haf/branches/osso-gnome-vfs2/2-16-upstream-merge/debian/control
Log:
Add patch and libsmbclient dep.

Modified: projects/haf/branches/osso-gnome-vfs2/2-16-upstream-merge/debian/changelog
===================================================================
--- projects/haf/branches/osso-gnome-vfs2/2-16-upstream-merge/debian/changelog	2006-12-04 10:20:38 UTC (rev 8573)
+++ projects/haf/branches/osso-gnome-vfs2/2-16-upstream-merge/debian/changelog	2006-12-04 10:26:56 UTC (rev 8574)
@@ -1,6 +1,14 @@
+osso-gnome-vfs2 (2.16.3-1osso3) unstable; urgency=low
+
+  * UNRELEASED
+  * Add libsmbclient-dev dependency
+  * Add patch merged from stable for handling failed close()
+
+ -- Richard Hult <richard at imendio.com>  Mon, 04 Dec 2006 11:25:37 +0100
+
 osso-gnome-vfs2 (2.16.3-1osso2) unstable; urgency=low
 
-  * Added artificial monitors to the Samba module as patch 25.
+  * Added artificial monitors to the Samba module as patch 25
 
  -- Martyn Russell <martyn at imendio.com>  Fri, 01 Dec 2006 16:54:00 +0000
 

Modified: projects/haf/branches/osso-gnome-vfs2/2-16-upstream-merge/debian/control
===================================================================
--- projects/haf/branches/osso-gnome-vfs2/2-16-upstream-merge/debian/control	2006-12-04 10:20:38 UTC (rev 8573)
+++ projects/haf/branches/osso-gnome-vfs2/2-16-upstream-merge/debian/control	2006-12-04 10:26:56 UTC (rev 8574)
@@ -2,7 +2,7 @@
 Section: libs
 Priority: optional
 Maintainer: Richard Hult <richard at imendio.com>
-Build-Depends: debhelper (>= 4.0.0), libglib2.0-dev, cdbs, libgconf2-dev (>= 2.6.4), libxml2-dev, gettext, debhelper (>> 4.1.0), zlib1g-dev, intltool, gnome-common, gnome-pkg-tools, libdbus-glib-1-dev (>= 0.60), osso-gwconnect-dev (>= 0.62), gtk-doc-tools
+Build-Depends: debhelper (>= 4.0.0), libglib2.0-dev, cdbs, libgconf2-dev (>= 2.6.4), libxml2-dev, gettext, debhelper (>> 4.1.0), zlib1g-dev, intltool, gnome-common, gnome-pkg-tools, libdbus-glib-1-dev (>= 0.60), osso-gwconnect-dev (>= 0.62), gtk-doc-tools, libsmbclient-dev
 Standards-Version: 3.6.1.0
 
 Package: libosso-gnomevfs2-common

Added: projects/haf/branches/osso-gnome-vfs2/2-16-upstream-merge/debian/patches/26-daemon-close-failed.patch
===================================================================
--- projects/haf/branches/osso-gnome-vfs2/2-16-upstream-merge/debian/patches/26-daemon-close-failed.patch	2006-12-04 10:20:38 UTC (rev 8573)
+++ projects/haf/branches/osso-gnome-vfs2/2-16-upstream-merge/debian/patches/26-daemon-close-failed.patch	2006-12-04 10:26:56 UTC (rev 8574)
@@ -0,0 +1,31 @@
+Index: daemon/daemon-connection.c
+===================================================================
+RCS file: /cvs/gnome/gnome-vfs/daemon/daemon-connection.c,v
+retrieving revision 1.6
+diff -u -B -p -r1.6 daemon-connection.c
+--- daemon/daemon-connection.c	10 Nov 2006 10:09:48 -0000	1.6
++++ daemon/daemon-connection.c	4 Dec 2006 10:01:48 -0000
+@@ -788,6 +788,13 @@ connection_handle_close (DaemonConnectio
+ 					      context);
+ 	gnome_vfs_daemon_set_current_connection (NULL);
+ 
++	/* Clear the handle so we don't close it twice. If close is not
++	 * successful, all modules destroy their internal handle data anyway so
++	 * we can't call close twice on a handle even if it fails the first
++	 * time.
++	 */
++	handle->vfs_handle = NULL;
++
+ 	if (cancellation) {
+ 		connection_remove_cancellation (conn, cancellation);
+ 	}
+@@ -796,9 +803,6 @@ connection_handle_close (DaemonConnectio
+ 		return;
+ 	}
+ 
+-	/* Clear the handle so we don't close it twice. */
+-	handle->vfs_handle = NULL;
+-	
+ 	remove_file_handle (handle);
+ 
+ 	connection_reply_ok (conn, message);