[Pkg-xfce-commits] r3607 - in desktop/branches/experimental/exo/debian: . patches

[Yves-Alexis Perez]

Author: corsac
Date: 2009-10-19 11:27:30 +0000 (Mon, 19 Oct 2009)
New Revision: 3607

Added:
   desktop/branches/experimental/exo/debian/patches/
   desktop/branches/experimental/exo/debian/patches/01_mount-async.patch
   desktop/branches/experimental/exo/debian/patches/series
Modified:
   desktop/branches/experimental/exo/debian/control
   desktop/branches/experimental/exo/debian/rules
Log:
don't mount all volumes synchronously


Modified: desktop/branches/experimental/exo/debian/control
===================================================================
--- desktop/branches/experimental/exo/debian/control	2009-10-18 16:22:13 UTC (rev 3606)
+++ desktop/branches/experimental/exo/debian/control	2009-10-19 11:27:30 UTC (rev 3607)
@@ -5,7 +5,7 @@
 Uploaders: Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>, Yves-Alexis Perez <corsac at debian.org>, Michael Casadevall <sonicmctails at gmail.com>
 Build-Depends: debhelper (>= 5.0.0), libxfcegui4-dev (>= 4.6.0),
  liburi-perl, chrpath, libhal-storage-dev [!hurd-i386], libnotify-dev,
- intltool
+ intltool, quilt (>= 0.46.7~)
 Standards-Version: 3.8.3
 Homepage: http://libexo.os-cillation.com/
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/exo/

Added: desktop/branches/experimental/exo/debian/patches/01_mount-async.patch
===================================================================
--- desktop/branches/experimental/exo/debian/patches/01_mount-async.patch	                        (rev 0)
+++ desktop/branches/experimental/exo/debian/patches/01_mount-async.patch	2009-10-19 11:27:30 UTC (rev 3607)
@@ -0,0 +1,24 @@
+commit ac57b8a8e7011bab0919fb7717188bdbf3be1c27
+Author: Nick Schermer <nick at xfce.org>
+Date:   Mon Oct 19 00:47:32 2009 +0200
+
+    Only sync devices with no volume.
+    
+    If the devices is pollable and we set the sync option, this
+    will slowdown the transfer. I missed that when changing the
+    code.
+
+diff --git a/exo-mount/exo-mount-hal.c b/exo-mount/exo-mount-hal.c
+index a398d2e..6344864 100644
+--- a/exo-mount/exo-mount-hal.c
++++ b/exo-mount/exo-mount-hal.c
+@@ -741,7 +741,8 @@ exo_mount_hal_device_mount (ExoMountHalDevice *device,
+         {
+           option = NULL;
+ 
+-          if (strcmp (device->fsoptions[m], "sync") == 0)
++          if (strcmp (device->fsoptions[m], "sync") == 0
++              && device->volume == NULL)
+             {
+               /* non-pollable drive... */
+               option = g_strdup ("sync");

Added: desktop/branches/experimental/exo/debian/patches/series
===================================================================
--- desktop/branches/experimental/exo/debian/patches/series	                        (rev 0)
+++ desktop/branches/experimental/exo/debian/patches/series	2009-10-19 11:27:30 UTC (rev 3607)
@@ -0,0 +1 @@
+01_mount-async.patch

Modified: desktop/branches/experimental/exo/debian/rules
===================================================================
--- desktop/branches/experimental/exo/debian/rules	2009-10-18 16:22:13 UTC (rev 3606)
+++ desktop/branches/experimental/exo/debian/rules	2009-10-19 11:27:30 UTC (rev 3607)
@@ -4,13 +4,13 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-#include /usr/share/quilt/quilt.make
 EXO_VERSION=0.5
 EXO_LIBNAME=1
 EXO_SOVERSION=0
 
 config.status: configure
 	dh_testdir
+	dh_quilt_patch
 	# Add here commands to configure the package.
 	 ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --sysconfdir=/etc --libexecdir=/usr/lib/libexo-$(EXO_VERSION) --enable-final --disable-gtk-doc --disable-python --enable-notifications
 
@@ -32,6 +32,7 @@
 	[ ! -f Makefile ] || $(MAKE) distclean
 
 	dh_clean 
+	dh_quilt_unpatch
 
 install: build
 	dh_testdir